From 1724f77c35022b643c28dd3e5547679a5edc2d49 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期二, 17 三月 2026 14:17:26 +0800
Subject: [PATCH] Merge branch 'springboot3.5_cs' into spring3.5
---
rsf-server/src/main/resources/mapper/manager/LocItemMapper.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/rsf-server/src/main/resources/mapper/manager/LocItemMapper.xml b/rsf-server/src/main/resources/mapper/manager/LocItemMapper.xml
index 316b06d..8e7b119 100644
--- a/rsf-server/src/main/resources/mapper/manager/LocItemMapper.xml
+++ b/rsf-server/src/main/resources/mapper/manager/LocItemMapper.xml
@@ -22,7 +22,8 @@
FROM
man_loc_item li
INNER JOIN man_loc l ON l.id = li.loc_id
- WHERE l.use_status = #{type}
+ WHERE li.deleted = 0
+ AND l.use_status = #{type}
<if test="channel != null">
AND l.channel = #{channel}
</if>
--
Gitblit v1.9.1