From 7a393cea127859281a4edd08d6f75630a8d429a5 Mon Sep 17 00:00:00 2001
From: huangzhen <867217663@qq.com>
Date: 星期二, 26 九月 2023 16:32:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
exam-system/src/main/resources/mapper/noncoalmine/ViolationRegistrationMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/exam-system/src/main/resources/mapper/noncoalmine/ViolationRegistrationMapper.xml b/exam-system/src/main/resources/mapper/noncoalmine/ViolationRegistrationMapper.xml
index b9020a9..61d86a2 100644
--- a/exam-system/src/main/resources/mapper/noncoalmine/ViolationRegistrationMapper.xml
+++ b/exam-system/src/main/resources/mapper/noncoalmine/ViolationRegistrationMapper.xml
@@ -32,9 +32,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