From c0a87b9244e1521c76b8a0dc70b922f6fc3e30a1 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 17 七月 2025 16:35:23 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/resources/mapper/manager/WarehouseMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/rsf-server/src/main/resources/mapper/manager/WarehouseMapper.xml b/rsf-server/src/main/resources/mapper/manager/WarehouseMapper.xml
index 6ee5aff..d1ca1cb 100644
--- a/rsf-server/src/main/resources/mapper/manager/WarehouseMapper.xml
+++ b/rsf-server/src/main/resources/mapper/manager/WarehouseMapper.xml
@@ -4,6 +4,6 @@
<select id="selectByName" resultType="com.vincent.rsf.server.manager.entity.Warehouse">
SELECT wh.id AS id FROM man_warehouse wh LEFT JOIN man_warehouse_areas wa on wh.id = wa.warehouse_id
- WHERE wh.`name` LIKE CONCAT('%',#{name},'%') OR wa.`name` LIKE CONCAT('%',#{name},'%')
+ WHERE wh.`name` LIKE CONCAT('%',#{name},'%') OR wa.`name` LIKE CONCAT('%',#{name},'%') and wh.deleted = 0 and wa.deleted = 0
</select>
</mapper>
--
Gitblit v1.9.1