修改queryRoleRefUser,不仅限于当前登录人员的角色

modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysRoleService.java

@@ -64,4 +64,13 @@ public interface ISysRoleService extends ICrudService<SysRole> {
      */
     @ApiOperation(value = "查询符合条件的角色")
     List<SysRole> findAllByBaseBean(SysRole sysRole);
+
+    /**
+     * 根据sysRole属性 查询符合条件的角色
+     *
+     * @param sysRole
+     * @return
+     */
+    @ApiOperation(value = "查询符合条件的角色")
+    List<SysRole> findAllByRoleProperty(SysRole sysRole);
 }

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

@@ -241,35 +241,28 @@ public class SysRoleController extends CrudBaseController<SysRole> {
         }
     }
 
-    @PostMapping(value = "/queryRoleRefUser",consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @PostMapping(value = "/queryRoleRefUser", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
     @ApiOperation(value = "查询角色及关联的人员信息", notes = "查询角色及关联的人员信息")
     public BaseResultBean queryRoleRefUser(@RequestBody SysRoleModel sysRoleModel) {
         try {
             ListPager result = null;
+            List<SysRole> roleList = null;
             SysRole sysRole = sysRoleModel.getSysRole();
             Pager pager = sysRoleModel.getPager();
-            if (ObjectUtils.isEmpty(sysRole)){
+            if (ObjectUtils.isEmpty(sysRole)) {
                 sysRole = new SysRole();
             }
-            if (ObjectUtils.isEmpty(pager)){
+            if (ObjectUtils.isEmpty(pager)) {
                 pager = new Pager();
             }
-            List<SysRefUserRole> refList = personnelService.findSysRefUserRole(getSessionUser().getUser().getId());
+            roleList = sysRoleService.findAllByRoleProperty(sysRole);
-            if (refList != null && refList.size() > 0) {
-                List<Long> idList = new ArrayList<>(refList.size());
-                Map<Long, SysRefUserRole> refMap = new HashMap<>();
-                refList.forEach(ref -> {
-                    idList.add(ref.getRoleId());
-                    refMap.put(ref.getRoleId(), ref);
-                });
-
-                result = sysRoleService.querySysRole(sysRole, idList, pager);
-                List<SysRole> roleList = result.getObjectList();
             //过滤SysRefUserRole
+            if (ObjectUtils.isEmpty(roleList)){
+                return  ResultBean.success("操作成功");
+            }
 
             List<Long> roleIdList = roleList.stream().map(el -> el.getId()).collect(Collectors.toList());
-                result = personnelService.findSysRefUserRoleByRoleIds(roleIdList,pager);
+            result = personnelService.findSysRefUserRoleByRoleIds(roleIdList, pager);
-            }
             return ResultBean.success("操作成功").setListPager(result).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         } catch (ImppBusiException busExcep) {
             return ResultBean.fail(busExcep);

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleService.java

@@ -6,6 +6,7 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysRoleService;
 import cn.estsh.i3plus.core.apiservice.dao.IUserPermissionDao;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
 import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
+import cn.estsh.i3plus.platform.common.util.CommonConstWords;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
@@ -36,6 +37,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Example;
+import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
@@ -299,6 +301,14 @@ public class SysRoleService extends CrudService<SysRole> implements ISysRoleServ
         return this.roleRDao.findAll(example);
     }
 
+    @Override
+    public List<SysRole> findAllByRoleProperty(SysRole sysRole) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(sysRole);
+        DdlPreparedPack.getNumEqualPack(sysRole.getRoleStatus(), "roleStatus", packBean);
+        DdlPreparedPack.getStringLikerPack(sysRole.getName(), "name", packBean);
+        return roleRDao.findByHqlWhere(packBean);
+    }
+
 
 //    @Override
 //    public void packAfterRefreshCache() {