权限管理-列表查询5

fiveep-service/src/main/java/com/bizmatics/service/system/impl/SysMenuServiceImpl.java

@@ -279,15 +279,14 @@ public class SysMenuServiceImpl implements ISysMenuService {
         List<SysMenu> sysMenuListOne = new ArrayList<>();
         List<SysMenu> sysMenuListThree = new ArrayList<>();
         List<SysMenu> sysMenuListFour = new ArrayList<>();
-        if (roleId==1) {
+        if (SysUser.isAdmin(loginUser.getUser().getUserId())) {
             //全部目录查询
             sysMenuListTwo = menuMapper.getSysMenuList("M");
             //全部菜单查询
             sysMenuListOne = menuMapper.getSysMenuList("C");
             //全部按钮列表
             sysMenuListThree = menuMapper.getSysMenuList("F");
-            //已选中按钮列表
-            sysMenuListFour = menuMapper.getSysMenuList("F");
+
         } else {
             //全部目录查询
             sysMenuListTwo = menuMapper.getMenuListOne(loginUser.getUser().getUserId(), "M");
@@ -295,6 +294,12 @@ public class SysMenuServiceImpl implements ISysMenuService {
             sysMenuListOne = menuMapper.getMenuListOne(loginUser.getUser().getUserId(), "C");
             //全部按钮列表
             sysMenuListThree = menuMapper.getMenuListOne(loginUser.getUser().getUserId(), "F");
+
+        }
+        if (roleId==1){
+            //已选中按钮列表
+            sysMenuListFour = menuMapper.getSysMenuList("F");
+        }else {
             //已选中按钮列表
             sysMenuListFour = menuMapper.getButtonlist(0L, null, roleId);
         }