From 31b6aefacbee9dde61be6afcb7c6dbbf7c6baa7d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 02 Jan 2024 17:51:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/grid/mapper/GridmanMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/grid/mapper/GridmanMapper.xml b/src/main/java/org/springblade/modules/grid/mapper/GridmanMapper.xml
index cce8d15..468ce5d 100644
--- a/src/main/java/org/springblade/modules/grid/mapper/GridmanMapper.xml
+++ b/src/main/java/org/springblade/modules/grid/mapper/GridmanMapper.xml
@@ -148,7 +148,7 @@
limit 1
</select>
- <select id="getGridManByCode" resultType="org.flowable.idm.engine.impl.persistence.entity.UserEntity">
+ <select id="getGridManByCode" resultType="org.springblade.modules.system.entity.User">
SELECT
*
@@ -158,6 +158,6 @@
LEFT JOIN jczz_grid jg ON jgm.grid_id = jg.id
LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id
WHERE
- jgr.house_code = #{houseCode}
+ jgr.house_code = #{houseCode} and bu.is_deleted = 0
</select>
</mapper>
--
Gitblit v1.9.3