Parcourir la source

投资效益系统-获取前端菜单时根据类型查询

LHB il y a 3 mois
Parent
commit
803395f809

+ 2 - 2
src/main/java/org/springblade/modules/system/controller/MenuController.java

@@ -192,8 +192,8 @@ public class MenuController extends BladeController {
 	@GetMapping("/routes")
 	@ApiOperationSupport(order = 8)
 	@Operation(summary = "前端菜单数据", description = "前端菜单数据")
-	public R<List<MenuVO>> routes(BladeUser user, Long topMenuId) {
-		List<MenuVO> list = menuService.routes((user == null) ? null : user.getRoleId(), topMenuId,user.getClientId());
+	public R<List<MenuVO>> routes(BladeUser user, Long topMenuId ,Integer systemType) {
+		List<MenuVO> list = menuService.routes((user == null) ? null : user.getRoleId(), topMenuId,user.getClientId(),systemType);
 		return R.data(list);
 	}
 

+ 1 - 1
src/main/java/org/springblade/modules/system/mapper/MenuMapper.java

@@ -149,7 +149,7 @@ public interface MenuMapper extends BaseMapper<Menu> {
 	 * @param roleId
 	 * @return
 	 */
-	List<Menu> roleMenuByRoleId(List<Long> roleId,String clientId);
+	List<Menu> roleMenuByRoleId(List<Long> roleId,String clientId,Integer systemType);
 
 	/**
 	 * 权限配置菜单

+ 3 - 0
src/main/java/org/springblade/modules/system/mapper/MenuMapper.xml

@@ -152,6 +152,9 @@
         <if test="param2!=null">
             and sys_type = #{param2}
         </if>
+        <if test="param3!=null">
+            and system_type = #{param3}
+        </if>
 
     </select>
 

+ 3 - 3
src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java

@@ -90,7 +90,7 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
 	}
 
 	@Override
-	public List<MenuVO> routes(String roleId, Long topMenuId,String clientId) {
+	public List<MenuVO> routes(String roleId, Long topMenuId,String clientId,Integer systemType) {
 		if (StringUtil.isBlank(roleId)) {
 			return null;
 		}
@@ -102,12 +102,12 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
 		}
 		// 非超级管理员并且不是顶部菜单请求则返回对应角色权限菜单
 		else if (!AuthUtil.isAdministrator() && Func.isEmpty(topMenuId)) {
-			roleMenus = tenantPackageMenu(baseMapper.roleMenuByRoleId(Func.toLongList(roleId),clientId));
+			roleMenus = tenantPackageMenu(baseMapper.roleMenuByRoleId(Func.toLongList(roleId),clientId,systemType));
 		}
 		// 顶部菜单请求返回对应角色权限菜单
 		else {
 			// 角色配置对应菜单
-			List<Menu> roleIdMenus = baseMapper.roleMenuByRoleId(Func.toLongList(roleId),clientId);
+			List<Menu> roleIdMenus = baseMapper.roleMenuByRoleId(Func.toLongList(roleId),clientId,systemType);
 			// 反向递归角色菜单所有父级
 			List<Menu> routes = new LinkedList<>(roleIdMenus);
 			roleIdMenus.forEach(roleMenu -> recursion(allMenus, routes, roleMenu));