From 727c30f11ede5b3c82ead6e09e5e077c0e7519f1 Mon Sep 17 00:00:00 2001 From: “djh” <“3298565835@qq.com”> Date: 星期三, 05 二月 2025 13:02:21 +0800 Subject: [PATCH] Merge branch 'dev-20250116' of https://sinanoaq.cn:8888/r/swspkmas into dev-20250116 --- exam-system/src/main/resources/mapper/noncoalmine/WorkRegistrationMapper.xml | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/exam-system/src/main/resources/mapper/noncoalmine/WorkRegistrationMapper.xml b/exam-system/src/main/resources/mapper/noncoalmine/WorkRegistrationMapper.xml index ed03271..187b535 100644 --- a/exam-system/src/main/resources/mapper/noncoalmine/WorkRegistrationMapper.xml +++ b/exam-system/src/main/resources/mapper/noncoalmine/WorkRegistrationMapper.xml @@ -31,9 +31,12 @@ <if test="query.idCard != null and query.idCard != ''"> and id_card like concat('%', #{query.idCard}, '%') </if> - <if test="query.operateTypeId != null and query.operateTypeId != 0"> + <if test="query.operateTypeId != null"> and (operate_type_id = #{query.operateTypeId} OR operate_type_id IN ( SELECT t.id FROM sys_operate_type t WHERE find_in_set(#{query.operateTypeId}, ancestors))) </if> + <if test="query.isCm != null"> + and is_cm = #{query.isCm} + </if> order by create_time desc </select> -- Gitblit v1.9.2