修改部门 仓库bug

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);

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;
 }

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>
+</mapper>

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>
 
 

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

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>
+</mapper>