权限管理-列表查询2

fiveep-controller/src/main/java/com/bizmatics/controller/web/UserSiteController.java

@@ -39,8 +39,8 @@ public class UserSiteController {
     }
 
     @GetMapping(value = "/getAuthority")
-    public ApiResult<List<Object>> getAuthority(){
-        return  ApiResult.success(menuService.getAuthority());
+    public ApiResult<List<Object>> getAuthority(@RequestParam(value = "roleId") Long roleId){
+        return  ApiResult.success(menuService.getAuthority(roleId));
     }
 
 }

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/system/SysMenuMapper.java

@@ -70,7 +70,7 @@ public interface SysMenuMapper
      * @param userId
      * @return
      */
-    public List<SysMenu> getButtonlist(Long userId, String menuName);
+    public List<SysMenu> getButtonlist(Long userId, String menuName,Long roleId);
 
     public List<SysMenu> getButtonlistOne(String menuName);
 

fiveep-persistence/src/main/resources/mapper/mysql/system/SysMenuMapper.xml

@@ -95,8 +95,13 @@
 		WHERE
 		a. STATUS = 0
 		AND d. STATUS = 0
+		<if test="roleId != null and roleId != 0">
+			AND d.role_id  = #{roleId}
+		</if>
+		<if test="userId != null and userId != 0">
+			AND c.user_id = #{userId}
+		</if>
 		AND a.menu_type = 'F'
-		AND c.user_id = #{userId}
 		AND a.parent_id in (
 		SELECT
 		menu_id

fiveep-service/src/main/java/com/bizmatics/service/system/ISysMenuService.java

@@ -82,7 +82,7 @@ public interface ISysMenuService
      */
     public List<TreeSelect> buildMenuTreeSelect(List<SysMenu> menus);
 
-    public List<Object> getAuthority();
+    public List<Object> getAuthority(Long roleId);
 
     /**
      * 根据菜单ID查询信息

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

@@ -270,19 +270,15 @@ public class SysMenuServiceImpl implements ISysMenuService {
     }
 
     @Override
-    public List<Object> getAuthority(){
+    public List<Object> getAuthority(Long roleId){
 
-        SysUser user = SecurityUtils.getLoginUser().getUser();
+//        SysUser user = SecurityUtils.getLoginUser().getUser();
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-
         List<SysMenu> menuList = null;
-        // 管理员显示所有菜单信息
-//            menuList = menuMapper.selectMenuList(menu);
-//            menuList = menuMapper.selectMenuListByUserId(menu);
         List<SysMenu> sysMenuListTwo = new ArrayList<>();
         List<SysMenu> sysMenuListOne = new ArrayList<>();
         List<SysMenu> sysMenuListThree = new ArrayList<>();
-        if (SysUser.isAdmin(user.getUserId())){
+        if (SysUser.isAdmin(loginUser.getUser().getUserId())){
             //全部目录查询
             sysMenuListTwo = menuMapper.getSysMenuList("M");
             //全部菜单查询
@@ -291,14 +287,14 @@ public class SysMenuServiceImpl implements ISysMenuService {
             sysMenuListThree = menuMapper.getSysMenuList("F");
         }else {
             //全部目录查询
-            sysMenuListTwo = menuMapper.getMenuListOne(user.getUserId(),"M");
+            sysMenuListTwo = menuMapper.getMenuListOne(loginUser.getUser().getUserId(),"M");
             //全部菜单查询
-            sysMenuListOne = menuMapper.getMenuListOne(user.getUserId(),"C");
+            sysMenuListOne = menuMapper.getMenuListOne(loginUser.getUser().getUserId(),"C");
             //全部按钮列表
-            sysMenuListThree = menuMapper.getMenuListOne(user.getUserId(),"F");
+            sysMenuListThree = menuMapper.getMenuListOne(loginUser.getUser().getUserId(),"F");
         }
         //已选中按钮列表
-        List<SysMenu> sysMenuListFour = menuMapper.getButtonlist(user.getUserId(), null);
+        List<SysMenu> sysMenuListFour = menuMapper.getButtonlist(0L, null,roleId);
         List<SysMenuTwoVo> sysMenuVoListOne = new ArrayList<>();
         List<SysMenuOneVo> SysMenuVoList = new ArrayList<>();
         List<SysMenuVo> SysMenuVoListOne = new ArrayList<>();
@@ -471,7 +467,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
         if (SecurityUtils.isAdmin(user.getUserId())) {
             sysMenuList = menuMapper.getButtonlistOne(menuName);
         } else {
-            sysMenuList = menuMapper.getButtonlist(user.getUserId(), menuName);
+            sysMenuList = menuMapper.getButtonlist(user.getUserId(), menuName, 0L);
         }
         return sysMenuList;
     }