diff --git a/src/main/java/com/glxp/api/controller/auth/AuthUserController.java b/src/main/java/com/glxp/api/controller/auth/AuthUserController.java index cc1ae5dbe..5d9d8dc45 100644 --- a/src/main/java/com/glxp/api/controller/auth/AuthUserController.java +++ b/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 warehouseUserEntities = warehouseUserService.getWarehouseUserList(filterInvLinkDataRequest); + List list = new ArrayList<>(); + for (Long aLong : filterInvLinkDataRequest.getListUser()) { + list.add(aLong); + } + List warehouseUserEntities1 = warehouseUserService.selectNotSelectUserid(list); List userIds = new ArrayList<>(); - warehouseUserEntities.forEach(user -> { - userIds.add(user.getUserid()); - }); + for (WarehouseUserEntity warehouseUserEntity : warehouseUserEntities1) { + userIds.add(warehouseUserEntity.getUserid()); + } + +// List userIds = new ArrayList<>(); +// warehouseUserEntities.forEach(user -> { +// userIds.add(user.getUserid()); +// }); FilterNoSelectUserRequest filterNoSelectUserRequest = new FilterNoSelectUserRequest(); BeanUtils.copyProperties(filterInvLinkDataRequest, filterNoSelectUserRequest); filterNoSelectUserRequest.setUserIds(userIds); diff --git a/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java b/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java index 97c6e0abf..3bbaeb1a8 100644 --- a/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java +++ b/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java @@ -39,6 +39,8 @@ public interface WarehouseUserDao { List selectListByCode(@Param("code") String code); List selectListkey(FilterInvLinkDataRequest filterInvLinkDataRequest); + + List selectNotSelectUserid(@Param("userIds")List userIds ); List selectCodeByUser(@Param("userId") String userId); void deleteByCode(@Param("code") String code); diff --git a/src/main/java/com/glxp/api/req/auth/FilterInvLinkDataRequest.java b/src/main/java/com/glxp/api/req/auth/FilterInvLinkDataRequest.java index e5f0eb935..ba07327fe 100644 --- a/src/main/java/com/glxp/api/req/auth/FilterInvLinkDataRequest.java +++ b/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[]; } diff --git a/src/main/java/com/glxp/api/service/auth/WarehouseUserService.java b/src/main/java/com/glxp/api/service/auth/WarehouseUserService.java index f6cfad592..c8e44497d 100644 --- a/src/main/java/com/glxp/api/service/auth/WarehouseUserService.java +++ b/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 getWarehouseUserList(FilterInvLinkDataRequest filterInvLinkDataRequest); + List selectNotSelectUserid(@Param("userIds")List userIds ); /** * 根据分仓编码,统计用户数量 diff --git a/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java index 9b00bf59d..775180e93 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java +++ b/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 selectNotSelectUserid(List userIds) { + return warehouseUserDao.selectNotSelectUserid(userIds); + } + @Override public Integer countUserBySubInvCode(String subInvCode) { return warehouseUserDao.countByCode(subInvCode); diff --git a/src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml b/src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml index 7d2475fb9..41efb1dcc 100644 --- a/src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml +++ b/src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml @@ -22,6 +22,19 @@ from auth_warehouse_user where id = #{id,jdbcType=INTEGER} + delete from auth_warehouse_user