From f49fb06de31e5a8ac51cc5a416770861c40a7209 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 10 Feb 2023 10:19:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/glxp/api/controller/auth/AuthUserController.java | 1 +
 src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java         | 2 +-
 .../java/com/glxp/api/req/auth/FilterInvLinkDataRequest.java  | 1 +
 .../java/com/glxp/api/req/auth/FilterNoSelectUserRequest.java | 1 +
 .../com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java  | 2 +-
 src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml       | 4 +++-
 6 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/auth/AuthUserController.java b/src/main/java/com/glxp/api/controller/auth/AuthUserController.java
index f42cd758a..4f63c2783 100644
--- a/src/main/java/com/glxp/api/controller/auth/AuthUserController.java
+++ b/src/main/java/com/glxp/api/controller/auth/AuthUserController.java
@@ -102,6 +102,7 @@ public class AuthUserController extends BaseController {
         FilterNoSelectUserRequest filterNoSelectUserRequest = new FilterNoSelectUserRequest();
         BeanUtils.copyProperties(filterInvLinkDataRequest, filterNoSelectUserRequest);
         filterNoSelectUserRequest.setUserIds(userIds);
+        filterNoSelectUserRequest.setLocDeptCode(filterInvLinkDataRequest.getParentId());
         List<AuthAdmin> hospitalUserList = authAdminService.selectNotSelectUser(filterNoSelectUserRequest);
         PageInfo<AuthAdmin> authAdminPageInfo = new PageInfo<>(hospitalUserList);
         PageSimpleResponse<AuthAdmin> authAdminPageSimpleResponse = new PageSimpleResponse<>();
diff --git a/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java b/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java
index 44c6a77ce..9eb1b4094 100644
--- a/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java
+++ b/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java
@@ -74,7 +74,7 @@ public interface AuthAdminDao {
      */
     List<AuthAdmin> selectHospitalUser();
 
-    List<AuthAdmin> selectNotSelectUser(@Param("userIds") List<Long> userIds);
+    List<AuthAdmin> selectNotSelectUser(@Param("userIds") List<Long> userIds,@Param("locDeptCode") String locDeptCode);
 
     List<AuthAdmin> selectAllocatedList(FilterAuthUserRequest filterAuthUserRequest);
 
diff --git a/src/main/java/com/glxp/api/req/auth/FilterInvLinkDataRequest.java b/src/main/java/com/glxp/api/req/auth/FilterInvLinkDataRequest.java
index ba07327fe..58fc1977b 100644
--- a/src/main/java/com/glxp/api/req/auth/FilterInvLinkDataRequest.java
+++ b/src/main/java/com/glxp/api/req/auth/FilterInvLinkDataRequest.java
@@ -14,6 +14,7 @@ public class FilterInvLinkDataRequest extends ListPageRequest {
     private String userName;
     private String employeeName;
     private Long listUser[];
+    private String parentId;
 
 
 }
diff --git a/src/main/java/com/glxp/api/req/auth/FilterNoSelectUserRequest.java b/src/main/java/com/glxp/api/req/auth/FilterNoSelectUserRequest.java
index 307553b73..647284d38 100644
--- a/src/main/java/com/glxp/api/req/auth/FilterNoSelectUserRequest.java
+++ b/src/main/java/com/glxp/api/req/auth/FilterNoSelectUserRequest.java
@@ -10,4 +10,5 @@ public class FilterNoSelectUserRequest extends ListPageRequest {
 
 
     List<Long> userIds;
+    private String locDeptCode;
 }
diff --git a/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java
index 3c9ba9e98..17b05e265 100644
--- a/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java
@@ -140,7 +140,7 @@ public class AuthAdminServiceImpl implements AuthAdminService {
             int offset = (filterNoSelectUserRequest.getPage() - 1) * filterNoSelectUserRequest.getLimit();
             PageHelper.offsetPage(offset, filterNoSelectUserRequest.getLimit());
         }
-        return authAdminDao.selectNotSelectUser(filterNoSelectUserRequest.getUserIds());
+        return authAdminDao.selectNotSelectUser(filterNoSelectUserRequest.getUserIds(),filterNoSelectUserRequest.getLocDeptCode());
     }
 
 
diff --git a/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml b/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml
index 189e910fa..70779a140 100644
--- a/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml
+++ b/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml
@@ -181,7 +181,9 @@
         from auth_user
         <where>
             userFlag != 0
-
+            <if test="locDeptCode != null and '' != locDeptCode">
+                AND locDeptCode = #{locDeptCode}
+            </if>
             <if test="userIds != null and userIds.size() != 0">
 
                 and id not in