diff --git a/src/main/java/com/glxp/api/controller/auth/DeptController.java b/src/main/java/com/glxp/api/controller/auth/DeptController.java index 7676ac98c..c38f4dfc8 100644 --- a/src/main/java/com/glxp/api/controller/auth/DeptController.java +++ b/src/main/java/com/glxp/api/controller/auth/DeptController.java @@ -62,7 +62,7 @@ public class DeptController { @AuthRuleAnnotation("") @GetMapping("spms/inv/warehouse/filterAll") public BaseResponse filterAllInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest) { - filterInvWarehouseRequest.setPid(0); + filterInvWarehouseRequest.setPid(0L); filterInvWarehouseRequest.setStatus(1); List invWarehouseEntities = deptService.filterInvWarehouse(filterInvWarehouseRequest); return ResultVOUtils.success(invWarehouseEntities); @@ -72,7 +72,7 @@ public class DeptController { @AuthRuleAnnotation("") @GetMapping("spms/inv/warehouse/filterNext") public BaseResponse filterNext(FilterInvWarehouseRequest filterInvWarehouseRequest) { - filterInvWarehouseRequest.setPid(0); + filterInvWarehouseRequest.setPid(0L); filterInvWarehouseRequest.setStatus(1); List invWarehouseEntities = deptService.filterGroupInvWarehouse(filterInvWarehouseRequest); @@ -84,7 +84,7 @@ public class DeptController { @GetMapping("spms/inv/warehouse/filterByUser") public BaseResponse filterByUser(FilterInvWarehouseRequest filterInvWarehouseRequest) { AuthAdmin authAdmin = customerService.getUserBean(); - filterInvWarehouseRequest.setPid(0); + filterInvWarehouseRequest.setPid(0L); filterInvWarehouseRequest.setStatus(1); filterInvWarehouseRequest.setUserId(authAdmin.getId()); List mInvWarehouseEntities = deptService.filterAllByUser(filterInvWarehouseRequest); @@ -95,7 +95,7 @@ public class DeptController { @AuthRuleAnnotation("") @GetMapping("spms/inv/warehouse/filterAllLocInv") public BaseResponse filterAllLocInv(FilterInvWarehouseRequest filterInvWarehouseRequest) { - filterInvWarehouseRequest.setPid(0); + filterInvWarehouseRequest.setPid(0L); filterInvWarehouseRequest.setStatus(1); List invWarehouseEntities = deptService.filterInvWarehouse(filterInvWarehouseRequest); SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("corp_innor_inv"); @@ -124,12 +124,12 @@ public class DeptController { @AuthRuleAnnotation("") @GetMapping("spms/inv/warehouse/filterUplLocInv") public BaseResponse filterUplLocInv(FilterInvWarehouseRequest filterInvWarehouseRequest) { - filterInvWarehouseRequest.setPid(0); + filterInvWarehouseRequest.setPid(0L); filterInvWarehouseRequest.setStatus(1); List invWarehouseEntities; AuthAdmin authAdmin = customerService.getUserBean(); filterInvWarehouseRequest.setUserId(authAdmin.getId()); - filterInvWarehouseRequest.setPid(0); + filterInvWarehouseRequest.setPid(0L); List mInvWarehouseEntities = deptService.filterAllByUser(filterInvWarehouseRequest); Map invWarehouseEntityMap = new HashMap<>(); if (mInvWarehouseEntities.size() > 0) { @@ -155,7 +155,7 @@ public class DeptController { List invWarehouseEntities; AuthAdmin authAdmin = customerService.getUserBean(); filterInvWarehouseRequest.setUserId(authAdmin.getId()); - filterInvWarehouseRequest.setPid(0); + filterInvWarehouseRequest.setPid(0L); invWarehouseEntities = deptService.filterAllByUser(filterInvWarehouseRequest); return ResultVOUtils.success(invWarehouseEntities); @@ -181,7 +181,7 @@ public class DeptController { } //顶级部门 if (deptEntity.getPid() == null || deptEntity.getPid() == 0) { - deptEntity.setPid(0); // 默认设置 + deptEntity.setPid(0L); // 默认设置 FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest(); filterInvWarehouseRequest.setPid(deptEntity.getPid()); DeptEntity codeEntity = deptService.selectMaxCode(filterInvWarehouseRequest); diff --git a/src/main/java/com/glxp/api/entity/auth/DeptEntity.java b/src/main/java/com/glxp/api/entity/auth/DeptEntity.java index f313bbe33..ef180b7ea 100644 --- a/src/main/java/com/glxp/api/entity/auth/DeptEntity.java +++ b/src/main/java/com/glxp/api/entity/auth/DeptEntity.java @@ -10,7 +10,7 @@ import java.util.Date; @TableName("auth_dept") public class DeptEntity { private Long id; - private Integer pid; + private Long pid; private String code; private String name; private Boolean advanceType; diff --git a/src/main/java/com/glxp/api/req/auth/FilterInvWarehouseRequest.java b/src/main/java/com/glxp/api/req/auth/FilterInvWarehouseRequest.java index 9a4067020..e030b08d6 100644 --- a/src/main/java/com/glxp/api/req/auth/FilterInvWarehouseRequest.java +++ b/src/main/java/com/glxp/api/req/auth/FilterInvWarehouseRequest.java @@ -9,8 +9,8 @@ import java.util.List; @Data public class FilterInvWarehouseRequest extends ListPageRequest { - private Integer id; - private Integer pid; + private Long id; + private Long pid; private String code; private String name; private String deptCode;