From 7dc5254d9a9c134b79fb9c0c5e43e0f32d80e651 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Tue, 12 Nov 2024 01:02:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BC=98=E5=8C=96=E8=BF=90=E5=8D=95?= =?UTF-8?q?=E5=88=97=E8=A1=A8=202.=E5=A2=9E=E5=8A=A0=E8=BF=9C=E7=A8=8B?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/BasicdataWarehouseClient.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataWarehouseClient.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataWarehouseClient.java index 74f417983..eaed3482b 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataWarehouseClient.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataWarehouseClient.java @@ -167,23 +167,23 @@ public class BasicdataWarehouseClient implements IBasicdataWarehouseClient { public List getWarehouseIds() { - String a ="123"; - String[] split = a.split("a"); - String md = split[10]; +// String a ="123"; +// String[] split = a.split("a"); +// String md = split[10]; // 仓库ID集合 -// List watermarkIds = new ArrayList<>(); -// // 增加仓库权限的限制 -// BasicdataWarehouseEntity myCurrentWarehouse = this.getMyCurrentWarehouse(); -// if (Objects.isNull(myCurrentWarehouse)) { -// List myWarehouseList = this.getMyWarehouseList(); -// myWarehouseList.forEach(warehouse -> { -// watermarkIds.add(warehouse.getId()); -// }); -// } else { -// watermarkIds.add(myCurrentWarehouse.getId()); -// } + List watermarkIds = new ArrayList<>(); + // 增加仓库权限的限制 + BasicdataWarehouseEntity myCurrentWarehouse = this.getMyCurrentWarehouse(); + if (Objects.isNull(myCurrentWarehouse)) { + List myWarehouseList = this.getMyWarehouseList(); + myWarehouseList.forEach(warehouse -> { + watermarkIds.add(warehouse.getId()); + }); + } else { + watermarkIds.add(myCurrentWarehouse.getId()); + } return null; }