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; }