仓库管理查询不分页

src/main/java/com/boco/nbd/wios/manage/controller/WarehouseController.java

@@ -92,6 +92,20 @@ public class WarehouseController {
     @GetMapping(value = "warehouse/all")
     @ApiOperation(value = "查询仓库")
     public BaseResponse<List<WarehouseDTO2>> qryWarehouseList(WarehouseQuery2 warehouseQuery2) {
+        warehouseQuery2.setIsWarehousePage(1);
+        List<WarehouseDTO2> list = warehouseService.qryWarehouseDetailList(warehouseQuery2);
+        return new BaseResponse<List<WarehouseDTO2>>(list);
+    }
+    /**
+     * 查询仓库不分页
+     *
+     * @param warehouseQuery2
+     * @return
+     */
+    @GetMapping(value = "warehouse/allNoPage")
+    @ApiOperation(value = "查询仓库")
+    public BaseResponse<List<WarehouseDTO2>> qryWarehouseListNoPage(WarehouseQuery2 warehouseQuery2) {
+        warehouseQuery2.setIsWarehousePage(2);
         List<WarehouseDTO2> list = warehouseService.qryWarehouseDetailList(warehouseQuery2);
         return new BaseResponse<List<WarehouseDTO2>>(list);
     }

src/main/java/com/boco/nbd/wios/manage/entity/dto/WarehouseQuery.java

@@ -47,6 +47,8 @@ public class WarehouseQuery {
 
     @ApiModelProperty(value = "分页数量",required = true)
     private Integer pagecount;
+    @ApiModelProperty("是否分页，1是分页,2是不分页")
+    private Integer isWarehousePage;
 
     public String getId() {
         return id;
@@ -135,4 +137,12 @@ public class WarehouseQuery {
     public void setCreateAccount(String createAccount) {
         this.createAccount = createAccount;
     }
+
+    public Integer getIsWarehousePage() {
+        return isWarehousePage;
+    }
+
+    public void setIsWarehousePage(Integer isWarehousePage) {
+        this.isWarehousePage = isWarehousePage;
+    }
 }

src/main/java/com/boco/nbd/wios/manage/service/impl/WarehouseService.java

@@ -265,7 +265,10 @@ public class WarehouseService {
         }
         warehouseQuery.setAppkey(appkey);
         logger.info("qryWarehouseList请求数据:{}", JSONUtilsEx.serialize(warehouseQuery));
+        System.out.println("分页"+warehouseQuery.getPage());
+       if (warehouseQuery.getIsWarehousePage()==1){
            PageLimitHolderFilter.setContext(warehouseQuery.getPage(), warehouseQuery.getPagecount(), 0);
+       }
         List<String> serviceProviders = new ArrayList<>(1);
         if (org.apache.commons.lang3.StringUtils.isNotBlank(warehouseQuery.getServiceProvider())) {
             serviceProviders = Arrays.asList(warehouseQuery.getServiceProvider().split(CamsConstant.COMMA));