From 975b7a183f1bfcac3b7e7ad5bad1a42b729a32a3 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Mon, 24 Apr 2023 10:27:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E9=83=A8=E9=97=A8=20?=
 =?UTF-8?q?=E4=BB=93=E5=BA=93=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/api/controller/auth/SysUserController.java  |  2 +-
 .../mybatis/mapper/auth/WarehouseUserDao.xml         |  3 ++-
 .../mybatis/mapper/thrsys/ThrInvWarehouseDao.xml     | 12 +++++++++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/auth/SysUserController.java b/src/main/java/com/glxp/api/controller/auth/SysUserController.java
index ac1e44f7..39bc4950 100644
--- a/src/main/java/com/glxp/api/controller/auth/SysUserController.java
+++ b/src/main/java/com/glxp/api/controller/auth/SysUserController.java
@@ -297,7 +297,7 @@ public class SysUserController extends BaseController {
 
 
             //默认插入第一部门
-        List<Long> deptCodeList = null;
+        ArrayList<Long> deptCodeList = new ArrayList<>();
         FilterDeptUserReqeust filterDeptUserReqeust = new FilterDeptUserReqeust();
         filterDeptUserReqeust.setUserId(authUserSaveRequest.getId());
         List<DeptUserEntity> deptUserEntities = deptUserService.selectDeptUser(filterDeptUserReqeust);
diff --git a/src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml b/src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml
index 0edf07bb..f09a3fac 100644
--- a/src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml
+++ b/src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml
@@ -286,6 +286,7 @@
                 AND (auth_user.employeeName = #{key} or auth_warehouse_user.userName = #{key})
             </if>
         </where>
+        GROUP BY auth_warehouse_user.userId
     </select>
 
 
@@ -340,4 +341,4 @@
         set isDirector = #{isDirector}
         where id = #{id}
     </update>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml
index a525ce38..d7cfbbdc 100644
--- a/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml
+++ b/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml
@@ -41,8 +41,14 @@
 
     <select id="selectByThrDeptCode" parameterType="com.glxp.api.req.thrsys.FilterThrSubInvWarehouseRequest"
             resultType="com.glxp.api.entity.thrsys.ThrInvWarehouseEntity">
-        select * from thr_inv_warehouse where parentId not in (SELECT code FROM thr_dept
-         where status=#{status} and thirdSysFk=#{thirdSysFk}) and thirdSysFk=#{thirdSysFk}
+        select * from thr_inv_warehouse
+        <where>
+            parentId not in (SELECT code FROM thr_dept
+            where status=#{status} and thirdSysFk=#{thirdSysFk}) and thirdSysFk=#{thirdSysFk}
+            <if test=" name != '' and name != null">
+                and name like concat('%',#{name},'%')
+            </if>
+        </where>
 
     </select>
 
@@ -138,4 +144,4 @@
         updateTime = #{updateTime,jdbcType=DATE}
     </insert>
 
-</mapper>
\ No newline at end of file
+</mapper>