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/TFaultRepairMessageMapper.xml | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TFaultRepairMessageMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TFaultRepairMessageMapper.xml
index ba2c3f1..3e9f773 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TFaultRepairMessageMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TFaultRepairMessageMapper.xml
@@ -112,6 +112,7 @@
LEFT JOIN t_item i ON t.item_id = i.id
LEFT JOIN t_item_type it ON t.item_type_id = it.id
LEFT JOIN t_tenant tnt ON t.tenant_id = tnt.id
+ LEFT JOIN t_contract tc ON t.contract_id = tc.id
<where>
<if test="query.residentName != null and query.residentName != ''">
AND tnt.resident_name LIKE CONCAT('%', #{query.residentName}, '%')
@@ -128,6 +129,9 @@
<if test="query.handlePerson != null and query.handlePerson != ''">
AND t.handle_person LIKE CONCAT('%', #{query.handlePerson}, '%')
</if>
+ <if test="query.businessDeptId != null and query.businessDeptId != '' and query.businessDeptId != '0'">
+ AND tc.business_dept_id = #{query.businessDeptId}
+ </if>
AND t.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
</where>
ORDER BY t.create_time DESC
--
Gitblit v1.7.1