Merge branch 'pre-production'

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataWarehouseClient.java

@@ -167,23 +167,23 @@ public class BasicdataWarehouseClient implements IBasicdataWarehouseClient {
 	public List<Long> 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<Long> watermarkIds = new ArrayList<>();
-//		// 增加仓库权限的限制
-//		BasicdataWarehouseEntity myCurrentWarehouse = this.getMyCurrentWarehouse();
-//		if (Objects.isNull(myCurrentWarehouse)) {
-//			List<BasicdataWarehouseEntity> myWarehouseList = this.getMyWarehouseList();
-//			myWarehouseList.forEach(warehouse -> {
-//				watermarkIds.add(warehouse.getId());
-//			});
-//		} else {
-//			watermarkIds.add(myCurrentWarehouse.getId());
-//		}
+		List<Long> watermarkIds = new ArrayList<>();
+		// 增加仓库权限的限制
+		BasicdataWarehouseEntity myCurrentWarehouse = this.getMyCurrentWarehouse();
+		if (Objects.isNull(myCurrentWarehouse)) {
+			List<BasicdataWarehouseEntity> myWarehouseList = this.getMyWarehouseList();
+			myWarehouseList.forEach(warehouse -> {
+				watermarkIds.add(warehouse.getId());
+			});
+		} else {
+			watermarkIds.add(myCurrentWarehouse.getId());
+		}
 		return null;
 	}