增加查询当前登录人角色关联的人员信息接口

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java

@@ -241,9 +241,9 @@ public class SysRoleController extends CrudBaseController<SysRole> {
         }
     }
 
-    @PostMapping(value = "/queryRoleRefUser", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @PostMapping(value = "/queryAllRoleRefUser", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    @ApiOperation(value = "查询角色及关联的人员信息", notes = "查询角色及关联的人员信息")
+    @ApiOperation(value = "在所有角色中查询角色及关联的人员信息", notes = "查询角色及关联的人员信息")
-    public BaseResultBean queryRoleRefUser(@RequestBody SysRoleModel sysRoleModel) {
+    public BaseResultBean queryAllRoleRefUser(@RequestBody SysRoleModel sysRoleModel) {
         try {
             ListPager result = null;
             List<SysRole> roleList = null;
@@ -271,6 +271,41 @@ public class SysRoleController extends CrudBaseController<SysRole> {
         }
     }
 
+
+    @PostMapping(value = "/queryRoleRefUser", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @ApiOperation(value = "查询当前请求人员的角色及关联的人员信息", notes = "查询角色及关联的人员信息")
+    public BaseResultBean queryRoleRefUser(@RequestBody SysRoleModel sysRoleModel) {
+        try {
+            ListPager result = null;
+            SysRole sysRole = sysRoleModel.getSysRole();
+            Pager pager = sysRoleModel.getPager();
+            if (ObjectUtils.isEmpty(sysRole)){
+                sysRole = new SysRole();
+            }
+            if (ObjectUtils.isEmpty(pager)){
+                pager = new Pager();
+            }
+            List<SysRefUserRole> refList = personnelService.findSysRefUserRole(getSessionUser().getUser().getId());
+            if (refList != null && refList.size() > 0) {
+                List<Long> idList = new ArrayList<>(refList.size());
+                refList.forEach(ref -> {
+                    idList.add(ref.getRoleId());
+                });
+
+//                result = sysRoleService.querySysRole(sysRole, idList, pager);
+//                List<SysRole> roleList = result.getObjectList();
+//                //过滤SysRefUserRole
+//
+//                List<Long> roleIdList = roleList.stream().map(el -> el.getId()).collect(Collectors.toList());
+                result = personnelService.findSysRefUserRoleByRoleIds(idList,pager);
+            }
+            return ResultBean.success("操作成功").setListPager(result).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+        } catch (ImppBusiException busExcep) {
+            return ResultBean.fail(busExcep);
+        } catch (Exception e) {
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
     /**
      * 修改角色状态
      *