修改根据职位查询人员信息的接口

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

@@ -149,7 +149,7 @@ public interface ISysUserInfoService {
      * @return SysRefUserPosition
      */
     @ApiOperation(value = "关系查询-用户岗位",notes = "查询用户岗位关系")
-    List<SysRefUserPosition> findSysRefUserPositionByPositionName(String positionName);
+    List<SysUserInfo> findSysRefUserPositionByPositionName(String positionName);
 
     /**
      * 根据(组织ID,部门ID,用户名称,用户工号) 查询用户信息

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

@@ -601,9 +601,9 @@ public class SysUserInfoController extends CoreBaseController {
 
     @GetMapping("/find-position-ref-user")
     @ApiOperation(value = "根据职位名称查询用户信息", notes = "根据职位名称查询用户信息")
-    public BaseResultBean<SysRefUserPosition> findUserByPositionName(String positionName) {
+    public BaseResultBean<SysUserInfo> findUserByPositionName(String positionName) {
         try {
-            List<SysRefUserPosition> resultList = sysUserInfoService.findSysRefUserPositionByPositionName(positionName);
+            List<SysUserInfo> resultList = sysUserInfoService.findSysRefUserPositionByPositionName(positionName);
             return new ResultBean().setSuccess(true).setResultList(resultList).build();
         } catch (ImppBusiException busExcep) {
             return ResultBean.fail(busExcep);

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

@@ -338,22 +338,32 @@ public class SysUserInfoService implements ISysUserInfoService {
     }
 
     @Override
-    public List<SysRefUserPosition> findSysRefUserPositionByPositionName(String positionName) {
+    public List<SysUserInfo> findSysRefUserPositionByPositionName(String positionName) {
-        List<SysRefUserPosition> users = new ArrayList();
+        List<SysUserInfo> users = new ArrayList();
-        if (StringUtils.isEmpty(positionName)) {
+//        if (StringUtils.isEmpty(positionName)) {
+//            return users;
+//        }
+//        List<SysPosition> positionList = positionService.findAllByPositionName(positionName);
+//        if (ObjectUtils.isEmpty(positionList)) {
+//            return users;
+//        }
+//        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(AuthUtil.getOrganizeCode());
+//        DdlPreparedPack.getInPackList(
+//                positionList.stream().map(el -> el.getId()).collect(Collectors.toList()),
+//                "positionId",
+//                ddlPackBean
+//        );
+//        List<SysRefUserPosition>  refUserPositionList = refUserPositionRDao.findByHqlWhere(ddlPackBean);
+        if(ObjectUtils.isEmpty(positionName)){
             return users;
         }
-        List<SysPosition> positionList = positionService.findAllByPositionName(positionName);
+        DdlPackBean userPackBean = DdlPackBean.getDdlPackBean(AuthUtil.getOrganizeCode());
-        if (ObjectUtils.isEmpty(positionList)) {
+        DdlPreparedPack.getStringEqualPack(
-            return users;
+                positionName,
-        }
+                "positionNameRdd",
-        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(AuthUtil.getOrganizeCode());
+                userPackBean
-        DdlPreparedPack.getInPackList(
-                positionList.stream().map(el -> el.getId()).collect(Collectors.toList()),
-                "positionId",
-                ddlPackBean
         );
-        users = refUserPositionRDao.findByHqlWhere(ddlPackBean);
+        users = sysUserInfoRDao.findByHqlWhere(userPackBean);
         return users;
     }