修改bug

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

@@ -8,6 +8,7 @@ import com.glxp.api.controller.BaseController;
 import com.glxp.api.entity.auth.*;
 import com.glxp.api.req.auth.AuthUserSaveRequest;
 import com.glxp.api.req.auth.FilterInvLinkDataRequest;
+import com.glxp.api.req.auth.FilterInvWarehouseRequest;
 import com.glxp.api.req.auth.FilterNoSelectUserRequest;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.common.enums.ResultEnum;
@@ -32,7 +33,8 @@ public class AuthUserController extends BaseController {
     private AuthAdminService authAdminService;
     @Resource
     private WarehouseUserService warehouseUserService;
-
+    @Resource
+    DeptService deptService;
 
     @AuthRuleAnnotation("admin/auth/admin/updateInv")
     @PostMapping("/admin/auth/admin/updateInv")
@@ -102,7 +104,11 @@ public class AuthUserController extends BaseController {
         FilterNoSelectUserRequest filterNoSelectUserRequest = new FilterNoSelectUserRequest();
         BeanUtils.copyProperties(filterInvLinkDataRequest, filterNoSelectUserRequest);
         filterNoSelectUserRequest.setUserIds(userIds);
-        filterNoSelectUserRequest.setLocDeptCode(filterInvLinkDataRequest.getParentId());
+        //查询部门id
+        FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest();
+        filterInvWarehouseRequest.setCode(filterInvLinkDataRequest.getParentId());
+        List<DeptEntity> deptEntities = deptService.filterGroupInvWarehouse(filterInvWarehouseRequest);
+        filterNoSelectUserRequest.setDeptId(deptEntities.get(0).getId());
         List<AuthAdmin> hospitalUserList = authAdminService.selectNotSelectUser(filterNoSelectUserRequest);
         PageInfo<AuthAdmin> authAdminPageInfo = new PageInfo<>(hospitalUserList);
         PageSimpleResponse<AuthAdmin> authAdminPageSimpleResponse = new PageSimpleResponse<>();

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

@@ -74,7 +74,7 @@ public interface AuthAdminDao {
      */
     List<AuthAdmin> selectHospitalUser();
 
-    List<AuthAdmin> selectNotSelectUser(@Param("userIds") List<Long> userIds,@Param("locDeptCode") String locDeptCode);
+    List<AuthAdmin> selectNotSelectUser(@Param("userIds") List<Long> userIds,@Param("deptId") Integer deptId);
 
     List<AuthAdmin> selectAllocatedList(FilterAuthUserRequest filterAuthUserRequest);
 

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

@@ -10,5 +10,5 @@ public class FilterNoSelectUserRequest extends ListPageRequest {
 
 
     List<Long> userIds;
-    private String locDeptCode;
+    private Integer deptId;
 }

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

@@ -140,7 +140,7 @@ public class AuthAdminServiceImpl implements AuthAdminService {
             int offset = (filterNoSelectUserRequest.getPage() - 1) * filterNoSelectUserRequest.getLimit();
             PageHelper.offsetPage(offset, filterNoSelectUserRequest.getLimit());
         }
-        return authAdminDao.selectNotSelectUser(filterNoSelectUserRequest.getUserIds(),filterNoSelectUserRequest.getLocDeptCode());
+        return authAdminDao.selectNotSelectUser(filterNoSelectUserRequest.getUserIds(),filterNoSelectUserRequest.getDeptId());
     }
 
 

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

@@ -178,15 +178,15 @@
 
     <select id="selectNotSelectUser" resultType="com.glxp.api.entity.auth.AuthAdmin">
         select *
-        from auth_user
+        from auth_user left join auth_dept_user on auth_user.id=auth_dept_user.userId
         <where>
             userFlag != 0
-            <if test="locDeptCode != null and '' != locDeptCode">
-                AND locDeptCode = #{locDeptCode}
+            <if test="deptId != null and '' != deptId">
+                AND auth_dept_user.deptId = #{deptId}
             </if>
             <if test="userIds != null and userIds.size() != 0">
 
-                and id not in
+                and auth_user.id not in
 
                 <foreach collection="userIds" item="item" open="(" separator="," close=")">
                     #{item}