fix:bug修复

server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatUserServiceImpl.java

@@ -611,6 +611,7 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
             TokenUtil.platLogin(TokenUtil.tntGetToken(), userLoginVO);
             TokenUtil.platLogin(TokenUtil.tntGetToken(), userLoginVO);
 
 
             supperRoleMenuList(userLoginVO);
             supperRoleMenuList(userLoginVO);
+            filterOrgManageMenu(userLoginVO);
             setRoleMenuToRedis(userLoginVO);
             setRoleMenuToRedis(userLoginVO);
             return userLoginVO;
             return userLoginVO;
         }
         }
@@ -619,12 +620,36 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
         List<PlatMenu> menuList = getMenuListByUserId(userLoginVO);
         List<PlatMenu> menuList = getMenuListByUserId(userLoginVO);
 
 
         fillMenuList(menuList, userLoginVO);
         fillMenuList(menuList, userLoginVO);
-
+        filterOrgManageMenu(userLoginVO);
         setRoleMenuToRedis(userLoginVO);
         setRoleMenuToRedis(userLoginVO);
 
 
         return userLoginVO;
         return userLoginVO;
     }
     }
 
 
+    /**
+     * 用户所在的角色不是根组织上的角色，就不返回 “组织管理” 菜单
+     * @param userLoginVO
+     */
+    private void filterOrgManageMenu(PlatUserLoginVO userLoginVO) {
+        List<PlatMenuDTOVO> menuList = userLoginVO.getMenuList();
+        if (CollUtil.isEmpty(menuList)) {
+            return;
+        }
+        String tenantId = userLoginVO.getTenantId();
+        if (StrUtil.isBlank(tenantId)) {
+            return;
+        }
+        PlatOrg platOrg = platOrgService.getById(userLoginVO.getOrgId());
+        if (platOrg != null && !"0".equals(platOrg.getParentId())) {
+            PlatMenuDTOVO platMenuDTOVO =
+                    menuList.stream().filter(m -> "组织管理".equals(m.getName())).findFirst().orElse(null);
+            if (platMenuDTOVO == null || CollUtil.isEmpty(platMenuDTOVO.getChildren())) {
+                return;
+            }
+            platMenuDTOVO.getChildren().removeIf(m -> "组织管理".equals(m.getName()));
+        }
+    }
+
     @Override
     @Override
     public PlatUserLoginVO getRoleAndMenuList2() {
     public PlatUserLoginVO getRoleAndMenuList2() {
         //TODO 用join做
         //TODO 用join做