Merge remote-tracking branch 'origin/master'

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

@@ -89,10 +89,20 @@ public class AuthUserController extends BaseController {
     public BaseResponse selectNotSelectUser(FilterInvLinkDataRequest filterInvLinkDataRequest) {
         filterInvLinkDataRequest.setKey("1");
         List<WarehouseUserEntity> warehouseUserEntities = warehouseUserService.getWarehouseUserList(filterInvLinkDataRequest);
+        List<Long> list = new ArrayList<>();
+        for (Long aLong : filterInvLinkDataRequest.getListUser()) {
+            list.add(aLong);
+        }
+        List<WarehouseUserEntity> warehouseUserEntities1 = warehouseUserService.selectNotSelectUserid(list);
         List<Long> userIds = new ArrayList<>();
-        warehouseUserEntities.forEach(user -> {
+        for (WarehouseUserEntity warehouseUserEntity : warehouseUserEntities1) {
-            userIds.add(user.getUserid());
+            userIds.add(warehouseUserEntity.getUserid());
-        });
+        }
+
+//        List<Long> userIds = new ArrayList<>();
+//        warehouseUserEntities.forEach(user -> {
+//            userIds.add(user.getUserid());
+//        });
         FilterNoSelectUserRequest filterNoSelectUserRequest = new FilterNoSelectUserRequest();
         BeanUtils.copyProperties(filterInvLinkDataRequest, filterNoSelectUserRequest);
         filterNoSelectUserRequest.setUserIds(userIds);

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

@@ -39,6 +39,8 @@ public interface WarehouseUserDao {
     List<WarehouseUserEntity> selectListByCode(@Param("code") String code);
 
     List<WarehouseUserEntity> selectListkey(FilterInvLinkDataRequest filterInvLinkDataRequest);
+
+    List<WarehouseUserEntity> selectNotSelectUserid(@Param("userIds")List<Long> userIds );
     List<WarehouseUserEntity> selectCodeByUser(@Param("userId") String userId);
 
     void deleteByCode(@Param("code") String code);

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

@@ -13,6 +13,7 @@ public class FilterInvLinkDataRequest extends ListPageRequest {
     private String key;
     private String userName;
     private String employeeName;
+    private Long listUser[];
 
 
 }

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

@@ -5,6 +5,7 @@ import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.entity.auth.WarehouseUserEntity;
 import com.glxp.api.req.auth.FilterInvLinkDataRequest;
 import com.glxp.api.req.auth.FilterInvUserRequest;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -60,6 +61,7 @@ public interface WarehouseUserService {
      * @return
      */
     List<WarehouseUserEntity> getWarehouseUserList(FilterInvLinkDataRequest filterInvLinkDataRequest);
+    List<WarehouseUserEntity> selectNotSelectUserid(@Param("userIds")List<Long> userIds );
 
     /**
      * 根据分仓编码，统计用户数量

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

@@ -133,6 +133,11 @@ public class WarehouseUserServiceImpl implements WarehouseUserService {
         return warehouseUserDao.selectListkey(filterInvLinkDataRequest);
     }
 
+    @Override
+    public List<WarehouseUserEntity> selectNotSelectUserid(List<Long> userIds) {
+        return warehouseUserDao.selectNotSelectUserid(userIds);
+    }
+
     @Override
     public Integer countUserBySubInvCode(String subInvCode) {
         return warehouseUserDao.countByCode(subInvCode);

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

@@ -22,6 +22,19 @@
         from auth_warehouse_user
         where id = #{id,jdbcType=INTEGER}
     </select>
+    <select id="selectNotSelectUserid" resultMap="BaseResultMap">
+        select *
+        from auth_warehouse_user
+        <where>
+            <if test="userIds != null and userIds.size()!=0">
+                and id  in
+                <foreach collection="userIds" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+
+    </select>
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
         <!--@mbg.generated-->
         delete from auth_warehouse_user