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

---
 .../api/controller/auth/SysUserController.java  |  2 +-
 .../api/res/auth/InvSubWarehouseResponse.java   |  1 +
 .../mybatis/mapper/auth/AuthAdminDao.xml        |  4 ++--
 .../mybatis/mapper/auth/DeptUserDao.xml         | 17 +++++++++--------
 .../mybatis/mapper/auth/InvWarehouseDao.xml     |  6 +++++-
 .../mybatis/mapper/auth/WarehouseUserDao.xml    |  5 +++--
 6 files changed, 21 insertions(+), 14 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 2b2ddba67..d7b38f6ca 100644
--- a/src/main/java/com/glxp/api/controller/auth/SysUserController.java
+++ b/src/main/java/com/glxp/api/controller/auth/SysUserController.java
@@ -264,7 +264,7 @@ public class SysUserController extends BaseController {
         userService.updateAuthAdmin(authAdmin);
 
         //默认插入第一部门
-        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/java/com/glxp/api/res/auth/InvSubWarehouseResponse.java b/src/main/java/com/glxp/api/res/auth/InvSubWarehouseResponse.java
index 24ab3cf0b..7a9bb3a51 100644
--- a/src/main/java/com/glxp/api/res/auth/InvSubWarehouseResponse.java
+++ b/src/main/java/com/glxp/api/res/auth/InvSubWarehouseResponse.java
@@ -22,4 +22,5 @@ public class InvSubWarehouseResponse {
     private String parentCode;
     private String parentInvName;
     private Integer advanceType;
+    private Boolean spUse;
 }
diff --git a/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml b/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml
index e81cec48b..957d4e475 100644
--- a/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml
+++ b/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml
@@ -18,7 +18,7 @@
                 AND userFlag = #{userFlag}
             </if>
             <if test="userName != null and '' != userName">
-                AND userName LIKE CONCAT(#{userName}, '%')
+                AND userName LIKE CONCAT('%', #{userName}, '%')
             </if>
             <if test="neUserName != null and '' != neUserName">
                 AND userName != #{neUserName}
@@ -232,4 +232,4 @@
             </if>
         </where>
     </select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/src/main/resources/mybatis/mapper/auth/DeptUserDao.xml b/src/main/resources/mybatis/mapper/auth/DeptUserDao.xml
index 123fa62ac..8cdb52005 100644
--- a/src/main/resources/mybatis/mapper/auth/DeptUserDao.xml
+++ b/src/main/resources/mybatis/mapper/auth/DeptUserDao.xml
@@ -45,14 +45,14 @@
     <select id="selectJoinDeptUser" parameterType="com.glxp.api.req.auth.FilterDeptUserReqeust"
             resultType="com.glxp.api.res.auth.DeptUserResponse">
         SELECT auth_dept_user.*,
-               auth_user.userName,
-               auth_user.employeeName,
-               auth_dept.`name` deptName,
-               auth_user.comments
+        auth_user.userName,
+        auth_user.employeeName,
+        auth_dept.`name` deptName,
+        auth_user.comments
         FROM auth_dept_user
-                     INNER JOIN auth_user
-                on auth_dept_user.userId = auth_user.id
-                     INNER JOIN auth_dept on auth_dept_user.deptId = auth_dept.id
+        right JOIN auth_user
+        on auth_dept_user.userId = auth_user.id
+        left JOIN auth_dept on auth_dept_user.deptId = auth_dept.id
         <where>
             <if test="deptId != null">
                 and deptId = #{deptId}
@@ -62,9 +62,10 @@
             </if>
             <if test="key != null and key != ''">
                 and (auth_user.userName like concat('%', #{key}, '%') or
-                     auth_user.employeeName like concat('%', #{key}, '%'))
+                auth_user.employeeName like concat('%', #{key}, '%'))
             </if>
         </where>
+        group by auth_dept_user.userId
     </select>
 
 
diff --git a/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml b/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml
index a2c1ece2d..a2d4c438d 100644
--- a/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml
+++ b/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml
@@ -216,6 +216,9 @@
             <if test="advanceType != null">
                 advanceType=#{advanceType},
             </if>
+            <if test="spUse != null">
+                spUse=#{spUse},
+            </if>
         </trim>
         WHERE id = #{id}
     </update>
@@ -280,7 +283,8 @@
                a.thirdId4,
                b.name as parentName,
                a.parentCode,
-               c.name    parentInvName
+               c.name    parentInvName,
+               a.spUse
         FROM auth_warehouse a
                  left join auth_dept b on a.parentId = b.code
                  left join auth_warehouse c on a.parentCode = c.code
diff --git a/src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml b/src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml
index 0edf07bb3..38b880fd4 100644
--- a/src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml
+++ b/src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml
@@ -271,7 +271,7 @@
             parameterType="com.glxp.api.req.auth.FilterInvLinkDataRequest">
         select auth_warehouse_user.*, auth_user.employeeName
         from auth_warehouse_user
-                 inner join auth_user on auth_user.id = auth_warehouse_user.userId
+        inner join auth_user on auth_user.id = auth_warehouse_user.userId
         <where>
             <if test="code != '' and code != null">
                 AND code = #{code}
@@ -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>