菜单树修改为允许查询禁用状态菜单

src/main/java/com/aizuda/boot/modules/system/service/impl/SysResourceServiceImpl.java

@@ -43,16 +43,16 @@ public class SysResourceServiceImpl extends BaseServiceImpl<SysResourceMapper, S
         return super.page(page, lqw);
     }
 
-    private List<SysResource> listAll(boolean menu) {
+    private List<SysResource> listMenuAll() {
         return lambdaQuery().eq(SysResource::getStatus, 1)
                 // 菜单不查按钮
-                .ne(menu, SysResource::getType, 3)
+                .ne(SysResource::getType, 3)
                 .orderByDesc(SysResource::getSort).list();
     }
 
     @Override
     public List<ResourceTreeVO> listTree() {
-        List<SysResource> sysResourceList = this.listAll(false);
+        List<SysResource> sysResourceList = lambdaQuery().orderByDesc(SysResource::getSort).list();
         if (CollectionUtils.isEmpty(sysResourceList)) {
             return null;
         }
@@ -95,7 +95,7 @@ public class SysResourceServiceImpl extends BaseServiceImpl<SysResourceMapper, S
         List<SysResource> sysResourceList;
         if (UserSession.isAdmin(userSession.getId())) {
             // 管理员设置为所有权限
-            sysResourceList = this.listAll(true);
+            sysResourceList = this.listMenuAll();
         } else {
             sysResourceList = baseMapper.selectMenuByUserId(userSession.getId());
         }