From 099ea14bba367fd86f0dde37d908f07cc04c3d39 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期四, 10 四月 2025 15:38:01 +0800 Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/xizang --- ruoyi-system/src/main/resources/mapper/system/TCheckAcceptRecordMapper.xml | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/ruoyi-system/src/main/resources/mapper/system/TCheckAcceptRecordMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TCheckAcceptRecordMapper.xml index f0f1693..1b95b44 100644 --- a/ruoyi-system/src/main/resources/mapper/system/TCheckAcceptRecordMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/TCheckAcceptRecordMapper.xml @@ -76,6 +76,9 @@ AND t.check_time >= #{query.startTime} AND t.check_time <= #{query.endTime} </if> + <if test="query.businessDeptId != null and query.businessDeptId != '' and query.businessDeptId != 0"> + AND c.business_dept_id = #{query.businessDeptId} + </if> AND t.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()} </where> ORDER BY t.create_time DESC @@ -99,6 +102,9 @@ <if test="query.houseNameOrAddress != null and query.houseNameOrAddress != ''"> AND (h.house_name LIKE concat('%', #{query.houseNameOrAddress}, '%') or h.house_address LIKE concat('%', #{query.houseNameOrAddress}, '%')) </if> + <if test="query.businessDeptId != null and query.businessDeptId != ''"> + AND h.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