From d1cc113ac2ce39f6a06ab0a838ccf538766580c2 Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期三, 26 三月 2025 17:52:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' 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 d5450f9..39b0c9c 100644
--- a/ruoyi-system/src/main/resources/mapper/system/THouseMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/THouseMapper.xml
@@ -55,6 +55,9 @@
<if test="req.leaseStatus == 1">
and (t2.start_time is null) and t1.lease_status = 1
</if>
+ <if test="req.businessDeptId != null and req.businessDeptId != '' and req.businessDeptId!='0'">
+ and t1.business_dept_id = #{req.businessDeptId}
+ </if>
AND t1.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
</where>
order by t1.create_time desc
--
Gitblit v1.7.1