1

science-admin/src/main/java/com/yiboshi/science/rest/v1/AuthorizationController.java

@@ -182,11 +182,11 @@ public class AuthorizationController {
             ComUnit comUnit = comUnitService.getById(SecurityUserHolder.getUnitId());
             user.setUnitComplete(comUnitService.isComplete(comUnit));
         }
-        List<UserMenuDTO> menuList = systemMenuService.findByRoleId(SecurityUserHolder.getRoles());
+//      List<UserMenuDTO> menuList = systemMenuService.findByRoleId(SecurityUserHolder.getRoles());
         Map<String, Object> userInfo = new HashMap<String, Object>(3) {
             {
                 put("userInfo", user);
-                put("menuList", menuList);
+//              put("menuList", menuList);
             }
         };
         return ResponseDataModel.ok(userInfo);
@@ -195,8 +195,8 @@ public class AuthorizationController {
     @ApiOperation(value = "获取菜单", httpMethod = "GET", notes = "获取菜单")
     @RequestMapping(value = "/getMenu")
     @GetMapping
-    public ResponseDataModel<List<UserMenuDTO>> getMenu() {
-        List<UserMenuDTO> menuList = systemMenuService.findByRoleId(SecurityUserHolder.getRoles());
+    public ResponseDataModel<List<UserMenuDTO>> getMenu(Integer systemType) {
+        List<UserMenuDTO> menuList = systemMenuService.findByRoleId(SecurityUserHolder.getRoles(), systemType);
         return ResponseDataModel.ok(menuList);
     }
 

science-admin/src/main/java/com/yiboshi/science/service/SystemMenuService.java

@@ -20,7 +20,7 @@ public interface SystemMenuService extends BaseService<SystemMenuQueryVO, System
      * @param roleId
      * @return
      */
-    List<UserMenuDTO> findByRoleId(String roleId);
+    List<UserMenuDTO> findByRoleId(String roleId,Integer systemType);
     /** 获取菜单树
      *
      * @param

science-admin/src/main/java/com/yiboshi/science/service/impl/SystemMenuServiceImpl.java

@@ -70,13 +70,14 @@ public class SystemMenuServiceImpl extends BaseServiceImpl<SystemMenuDAO, System
     }
 
     @Override
-    public List<UserMenuDTO> findByRoleId(String roleId) {
+    public List<UserMenuDTO> findByRoleId(String roleId,Integer systemType) {
         QueryWrapper<SystemMenu> wrapper = new QueryWrapper<SystemMenu>();
         List<String> resultList = new ArrayList<>();
         String[] arr = roleId.split(",");
         for (int i = 0; i < arr.length; i++) {
             resultList.add(arr[i]);
         }
+        wrapper.like("a.system_type", systemType);
         wrapper.in("b.role_id", resultList);
         List<SystemMenuDTO> list = systemMenuDAO.findByRoleId(wrapper);
         //父级菜单