角色列表权限

cloud-model/src/main/java/com/hssx/cloudmodel/controller/UserController.java

@@ -139,18 +139,18 @@ public class UserController {
     /**
      *用户列表
      * 参数：pageNum 当前页码，pageSize 每页条数 keyName 关键字查询
-     * account 用户账号 token 用户凭证
+     * account 用户账号 token 用户凭证 roleType 角色类型
      * @return
      */
     @ApiOperation("用户列表")
     @RequestMapping("/list")
     @ResponseBody
-    public HttpRespMsg list(@RequestParam(required = false) String account, HttpServletRequest request,String token,
+    public HttpRespMsg list(@RequestParam(required = false) Integer roleType,@RequestParam(required = false) String account, HttpServletRequest request,String token,
                             HttpServletResponse response, PageUtil page,@RequestParam(required = false)String keyName) {
         HttpRespMsg msg = new HttpRespMsg();
         User newUser = userService.getOne(new QueryWrapper<User>().eq("head_imgurl", token));
         if(newUser != null){
-            msg = userService.pageList(page,account,keyName,newUser);
+            msg = userService.pageList(page,account,keyName,newUser,roleType);
         }else{
             msg.setError("当前用户不存，或涉及到权限问题，请重新登录");
         }

cloud-model/src/main/java/com/hssx/cloudmodel/service/UserService.java

@@ -21,5 +21,5 @@ public interface UserService extends IService<User> {
 
     HttpRespMsg login(User user, HttpServletRequest request);
 
-    HttpRespMsg pageList(PageUtil page, String account, String keyName,User user);
+    HttpRespMsg pageList(PageUtil page, String account, String keyName,User user,Integer roleType);
 }

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/UserServiceImpl.java

@@ -56,7 +56,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     }
 
     @Override
-    public HttpRespMsg pageList(PageUtil page, String account, String keyName,User user) {
+    public HttpRespMsg pageList(PageUtil page, String account, String keyName,User user,Integer roleType) {
         HttpRespMsg msg = new HttpRespMsg();
         QueryWrapper<User> qw = new QueryWrapper<>();
         if(keyName !=null && !"".equals(keyName)){
@@ -64,6 +64,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         }else if(account !=null && !"".equals(account)){
             qw.eq("account", account);
         }
+        //roleType == -2 默认不按角色筛选
+        if(roleType != -2){
+            qw.eq("role_type",roleType);
+        }
         qw.eq("parent_id",user.getParentId());
         PageHelper.startPage(page.getPageNum(),page.getPageSize());
         List<User> users = userMapper.selectList(qw);