From c885f99c9ff1445f6975d16faf4a23006cd5763b Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期三, 05 二月 2025 14:53:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xizang-changyun
---
ruoyi-system/src/main/resources/mapper/system/THouseMapper.xml | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/THouseMapper.xml b/ruoyi-system/src/main/resources/mapper/system/THouseMapper.xml
index 43cf3d6..d09143d 100644
--- a/ruoyi-system/src/main/resources/mapper/system/THouseMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/THouseMapper.xml
@@ -41,6 +41,7 @@
<if test="req.leaseStatus != null">
and t1.lease_status = #{req.leaseStatus}
</if>
+ AND t1.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
</where>
</select>
<select id="userHistoryList" resultType="com.ruoyi.system.vo.HouseVO">
@@ -61,6 +62,8 @@
left join t_tenant t2 on t1.tenant_id = t2.id
LEFT JOIN t_house t3 on t3.id = t1.house_id
where t1.house_id = #{req.id}
+ AND t1.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+
</select>
</mapper>
--
Gitblit v1.7.1