修改 部门 仓库问题

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

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

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
+        select * from thr_inv_warehouse
-         where status=#{status} and thirdSysFk=#{thirdSysFk}) and thirdSysFk=#{thirdSysFk}
+        <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>
+</mapper>