From 1bc47a86ace66c9a845aa50fc8f8e6d1131ba113 Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <583671871@qq.com>
Date: Tue, 8 Oct 2024 16:43:14 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E4=BB=93?=
 =?UTF-8?q?=E5=BA=93=E7=A7=9F=E7=94=A8=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/logpm/basicdata/mapper/WarehouseLeasingMapper.xml     | 2 +-
 .../java/com/logpm/basicdata/query/WarehouseLeasingQuery.java | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/WarehouseLeasingMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/WarehouseLeasingMapper.xml
index 3abf6f624..1c07177a9 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/WarehouseLeasingMapper.xml
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/WarehouseLeasingMapper.xml
@@ -31,7 +31,7 @@
         </if>
         <if test="warehouseLeasing.warehouseIds != null and warehouseLeasing.warehouseIds != ''">
             and t.warehouse_id in
-            <foreach collection="warehouseLeasing.warehouseIds" item="warehouseId" separator="," open="(" close=")">
+            <foreach collection="warehouseLeasing.warehouseIds.split(',')" item="warehouseId" separator="," open="(" close=")">
                 #{warehouseId}
             </foreach>
         </if>
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/query/WarehouseLeasingQuery.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/query/WarehouseLeasingQuery.java
index 297b98f30..99e7a8983 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/query/WarehouseLeasingQuery.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/query/WarehouseLeasingQuery.java
@@ -21,8 +21,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.support.Query;
 
-import java.util.List;
-
 /**
  * 仓库租用管理 视图实体类
  *
@@ -38,7 +36,7 @@ public class WarehouseLeasingQuery extends Query {
 	 * 仓库id
 	 */
 	@ApiModelProperty(value = "仓库id")
-	private List<Long> warehouseIds;
+	private String warehouseIds;
 
 	/**
 	 * 是否过期