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 666cd5ba7..cc1ae5dbe 100644 --- a/src/main/java/com/glxp/api/controller/auth/AuthUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/AuthUserController.java @@ -87,6 +87,7 @@ public class AuthUserController extends BaseController { @AuthRuleAnnotation("") @GetMapping("/admin/auth/admin/selectNotSelectUser") public BaseResponse selectNotSelectUser(FilterInvLinkDataRequest filterInvLinkDataRequest) { + filterInvLinkDataRequest.setKey("1"); List warehouseUserEntities = warehouseUserService.getWarehouseUserList(filterInvLinkDataRequest); List userIds = new ArrayList<>(); warehouseUserEntities.forEach(user -> { diff --git a/src/main/java/com/glxp/api/service/auth/impl/InvSpaceServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/InvSpaceServiceImpl.java index b1affe0a0..aa3f3c277 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/InvSpaceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/InvSpaceServiceImpl.java @@ -46,7 +46,7 @@ public class InvSpaceServiceImpl implements InvSpaceService { @Override public BaseResponse addSpace(InvSpace invSpace) { BaseResponse verifyResult = verifySpaceParams(invSpace); - if (verifyResult.getCode() == 20000) { + if (verifyResult.getCode() != 20000) { return verifyResult; } String result = verifyExist(invSpace); 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 2b90a86c4..9b00bf59d 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 @@ -122,7 +122,13 @@ public class WarehouseUserServiceImpl implements WarehouseUserService { } if (filterInvLinkDataRequest.getPage() != null) { int offset = (filterInvLinkDataRequest.getPage() - 1) * filterInvLinkDataRequest.getLimit(); - PageHelper.offsetPage(offset, filterInvLinkDataRequest.getLimit()); + if("1".equals(filterInvLinkDataRequest.getKey())){ + + PageHelper.startPage (offset, filterInvLinkDataRequest.getLimit()); + }else{ + PageHelper.offsetPage (offset, filterInvLinkDataRequest.getLimit()); + } + } return warehouseUserDao.selectListkey(filterInvLinkDataRequest); }