Browse Source

fix:修复用户权限获取排序失效问题

wangzaijun 7 months ago
parent
commit
3bbde851d5

+ 3 - 0
service-base/src/main/java/com/simuwang/base/common/util/TreeUtil.java

@@ -78,6 +78,9 @@ public class TreeUtil {
                 }
             }
         }
+        if (getOrder != null && treeList.size() > 1) {
+            treeList = getSortList(treeList, getOrder);
+        }
         return treeList;
     }
 

+ 3 - 1
service-manage/src/main/java/com/simuwang/manage/service/LoginService.java

@@ -63,7 +63,9 @@ public class LoginService {
                 .distinct().collect(Collectors.toList());
         // 用户权限处理
         List<SysMenuDO> menuList = this.userAuthService.listUserMenuByUserId(userId);
-        List<MenuTreeDTO> tempList = menuList.stream().map(MenuTreeDTO::new).collect(Collectors.toList());
+        // 过滤按钮
+        List<MenuTreeDTO> tempList = menuList.stream().filter(e -> !Objects.equals("F", e.getMenuType()))
+                .map(MenuTreeDTO::new).collect(Collectors.toList());
         // 菜单列表转树结构
         List<MenuTreeDTO> trees = TreeUtil.list2Tree(tempList, MenuTreeDTO::getId, MenuTreeDTO::getPid,
                 MenuTreeDTO::getChildren, MenuTreeDTO::setChildren, 0, MenuTreeDTO::getSort);