bug修复

src/main/java/com/xjrsoft/module/system/service/impl/MenuServiceImpl.java

@@ -46,6 +46,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -252,10 +253,12 @@ public class MenuServiceImpl extends MPJBaseServiceImpl<MenuMapper, Menu> implem
                     setTitle(menuGroupSet.getName());
                     setId(menuGroupSet.getId());
                     setDisplay(0);
+                    setMenuType(0);
                 }});
                 menuUsedMap.put(menuGroupSet.getId(), menuGroupSet.getUseRange());
             }
             List<XjrMenuGroup> xjrMenuGroupMenu = xjrMenuGroupSetService.getXjrMenuGroupMenu();
+            Set<Long> menuIds = xjrMenuGroupMenu.stream().map(XjrMenuGroup::getXjrMenuId).collect(Collectors.toSet());
             menuGroupMap.putAll(xjrMenuGroupMenu.stream().collect(Collectors.toMap(XjrMenuGroup::getXjrMenuId, XjrMenuGroup::getXjrMenuGroupSetId)));
             List<WhitelistManagement> managementList = whitelistManagementService.list(
                     new QueryWrapper<WhitelistManagement>().lambda()
@@ -267,19 +270,20 @@ public class MenuServiceImpl extends MPJBaseServiceImpl<MenuMapper, Menu> implem
                     menuDisabledMap.put(menuGroupMenu.getXjrMenuId(), 2);
                 }
             }
-        }
-
-
-        for (MenuVo menuVo : menuVos) {
-            menuVo.setDeptId(deptIdMap.get(menuVo.getId()));
-            menuVo.setDeptName(deptNameMap.get(menuVo.getId()));
-            if(roleIds.contains(RoleEnum.STUDENT.getCode()) && menuGroupMap.get(menuVo.getId()) != null){
-                menuVo.setParentId(menuGroupMap.get(menuVo.getId()));
-                menuVo.setIsDisable(menuDisabledMap.get(menuVo.getId()));
+            for (MenuVo menuVo : menuVos) {
+                menuVo.setDeptId(deptIdMap.get(menuVo.getId()));
+                menuVo.setDeptName(deptNameMap.get(menuVo.getId()));
+                if(menuGroupMap.get(menuVo.getId()) != null){
+                    menuVo.setParentId(menuGroupMap.get(menuVo.getId()));
+                    menuVo.setIsDisable(menuDisabledMap.get(menuVo.getId()));
+                }
+                if("system_app".equals(dto.getSystemType()) && menuIds.contains(menuVo.getId())){
+                    result.add(menuVo);
+                }
             }
-
+        }else{
+            result.addAll(menuVos);
         }
-        result.addAll(menuVos);
 
         return result;
     }