From fd635c86426f064bc3631e0a5172b088f6f1f71a Mon Sep 17 00:00:00 2001
From: nies <shuai.nie@estsh.com>
Date: Mon, 16 Aug 2021 16:38:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B9=E6=8D=AE=E8=81=8C?=
 =?UTF-8?q?=E4=BD=8D=E6=9F=A5=E8=AF=A2=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/iservice/busi/ISysUserInfoService.java     |  2 +-
 .../controller/busi/SysUserInfoController.java     |  4 +--
 .../serviceimpl/busi/SysUserInfoService.java       | 36 ++++++++++++++--------
 3 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserInfoService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserInfoService.java
index a308345..9e4e07c 100644
--- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserInfoService.java
+++ b/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,用户名称,用户工号) 查询用户信息
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java
index e4dc6cf..6b5dcaf 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java
+++ b/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);
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java
index d547771..da8bf42 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java
+++ b/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) {
-        List<SysRefUserPosition> users = new ArrayList();
-        if (StringUtils.isEmpty(positionName)) {
+    public List<SysUserInfo> findSysRefUserPositionByPositionName(String positionName) {
+        List<SysUserInfo> users = new ArrayList();
+//        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);
-        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
+        DdlPackBean userPackBean = DdlPackBean.getDdlPackBean(AuthUtil.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(
+                positionName,
+                "positionNameRdd",
+                userPackBean
         );
-        users = refUserPositionRDao.findByHqlWhere(ddlPackBean);
+        users = sysUserInfoRDao.findByHqlWhere(userPackBean);
         return users;
     }