From 48188c661ca37ed0fcfaf629381a25632f0b998b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Wed, 26 Apr 2023 10:57:39 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=97=E6=9D=90=E9=A2=86=E7=94=A8=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/controller/auth/InvWarehouseController.java | 4 +++- .../java/com/glxp/api/req/auth/FilterInvWarehouseRequest.java | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java index c4980feac..6427ada58 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java @@ -132,7 +132,9 @@ public class InvWarehouseController extends BaseController { return ResultVOUtils.error(500, "当前仓库不能为空！"); } FilterInvSubWarehouseRequest filterInvSubWarehouseRequest = new FilterInvSubWarehouseRequest(); - filterInvSubWarehouseRequest.setAdvanceType(1); + if(filterInvWarehouseRequest.getType()==null){ + filterInvSubWarehouseRequest.setAdvanceType(1); + } List invWarehouseEntities = invWarehouseService.filterInvSubWarehouse(filterInvSubWarehouseRequest); List results = new ArrayList<>(); if (CollUtil.isNotEmpty(invWarehouseEntities)) { 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 9fcbeab91..9a4067020 100644 --- a/src/main/java/com/glxp/api/req/auth/FilterInvWarehouseRequest.java +++ b/src/main/java/com/glxp/api/req/auth/FilterInvWarehouseRequest.java @@ -31,4 +31,5 @@ public class FilterInvWarehouseRequest extends ListPageRequest { private String superiorCode;//上级 private String subordinateCode;//下级 private String superiorPcode;//上级 + private Integer type; }