修改用户管理部门信息bug

src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java

@@ -71,7 +71,6 @@ public class InvWarehouseController extends BaseController {
         return ResultVOUtils.success(responses);
     }
 
-
     /**
      * 获取部门底下仓库列表-关联用户
      *

src/main/java/com/glxp/api/controller/auth/SysUserController.java

@@ -67,7 +67,12 @@ public class SysUserController extends BaseController {
             AuthAdminResponse authAdminResponse = new AuthAdminResponse();
             BeanUtils.copyProperties(item, authAdminResponse);
             List<Long> roles = sysRoleService.selectRoleListByUserId(authAdminResponse.getId());
-            List<DeptUserResponse> deptUserResponses = deptUserService.selectByUserId(authAdminResponse.getId());
+            List<DeptUserResponse> deptUserResponses=null;
+            if("key".equals(filterAuthUserRequest.getKey())){
+                deptUserResponses   = deptUserService.selectByUserIdKey(authAdminResponse.getId());
+            }else{
+             deptUserResponses = deptUserService.selectByUserId(authAdminResponse.getId());
+            }
             if (CollUtil.isNotEmpty(deptUserResponses)) {
                 List<Long> depts = new ArrayList<>();
                 String deptName = "";

src/main/java/com/glxp/api/dao/auth/DeptUserDao.java

@@ -16,6 +16,8 @@ public interface DeptUserDao {
 
     List<DeptUserResponse> selectJoinDeptUser(FilterDeptUserReqeust filterDeptUserReqeust);
 
+    List<DeptUserResponse> selectJoinDeptUserKey(FilterDeptUserReqeust filterDeptUserReqeust);
+
     boolean delete(@Param("deptId") Long deptId, @Param("userId") Long userId);
 
     int deleteById(Integer id);

src/main/java/com/glxp/api/req/auth/FilterAuthUserRequest.java

@@ -33,4 +33,6 @@ public class FilterAuthUserRequest extends ListPageRequest {
     private String deptCode;
     private String invCode;     //仓库号
 
+    private String key;
+
 }

src/main/java/com/glxp/api/service/auth/DeptUserService.java

@@ -15,6 +15,8 @@ public interface DeptUserService {
 
     List<DeptUserResponse> selectByUserId(Long userId);
 
+    List<DeptUserResponse> selectByUserIdKey(Long userId);
+
     List<DeptEntity> getDeptById( List<Integer> ids);
 
     List<DeptUserResponse> selectJoinDeptUser(FilterDeptUserReqeust filterDeptUserReqeust);

src/main/java/com/glxp/api/service/auth/impl/DeptUserServiceImpl.java

@@ -42,6 +42,13 @@ public class DeptUserServiceImpl implements DeptUserService {
         return deptUserDao.selectJoinDeptUser(filterDeptUserReqeust);
     }
 
+    @Override
+    public List<DeptUserResponse> selectByUserIdKey(Long userId) {
+        FilterDeptUserReqeust filterDeptUserReqeust = new FilterDeptUserReqeust();
+        filterDeptUserReqeust.setUserId(userId);
+        return deptUserDao.selectJoinDeptUserKey(filterDeptUserReqeust);
+    }
+
     @Override
     public List<DeptEntity> getDeptById(List<Integer> ids) {
         return deptDao.getDeptById(ids);

src/main/resources/mybatis/mapper/auth/DeptUserDao.xml

@@ -41,7 +41,32 @@
                      auth_user.employeeName like concat('%', #{key}, '%'))
             </if>
         </where>
+        group by auth_dept_user.userId
+    </select>
 
+    <select id="selectJoinDeptUserKey" 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
+        FROM auth_dept_user
+        left 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}
+            </if>
+            <if test="userId != null">
+                and userId = #{userId}
+            </if>
+            <if test="key != null and key != ''">
+                and (auth_user.userName like concat('%', #{key}, '%') or
+                auth_user.employeeName like concat('%', #{key}, '%'))
+            </if>
+        </where>
     </select>
 
 

src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml

@@ -299,7 +299,8 @@
                 AND a.advanceType = #{advanceType}
             </if>
             <if test="key != null and key != ''">
-                AND a.name like concat('%', #{key}, '%')
+                AND  (a.name like concat('%', #{key}, '%') or
+                a.code = #{key})
             </if>
         </where>
     </select>