From db7e077ea8f2d995e922bc11b77dc149592a7455 Mon Sep 17 00:00:00 2001 From: yupeng <roc__yu@163.com> Date: 星期三, 09 四月 2025 12:35:49 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xizang-changyun --- ruoyi-system/src/main/resources/mapper/system/TFaultRepairMessageMapper.xml | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ruoyi-system/src/main/resources/mapper/system/TFaultRepairMessageMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TFaultRepairMessageMapper.xml index 3e9f773..890c59c 100644 --- a/ruoyi-system/src/main/resources/mapper/system/TFaultRepairMessageMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/TFaultRepairMessageMapper.xml @@ -67,6 +67,7 @@ t.create_by, t.update_by, t.disabled, + t.fault_cause, i.item_name AS itemName, it.type_name AS itemTypeName, tnt.resident_name AS residentName @@ -129,7 +130,7 @@ <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'"> + <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()} -- Gitblit v1.7.1