From e5d1fb3d5ce9468b92e79825bbcb38f05ea73aff Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期一, 12 十月 2026 18:12:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-process/src/main/resources/mapper/ProcessMethodSearchNewMapper.xml | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/cnas-process/src/main/resources/mapper/ProcessMethodSearchNewMapper.xml b/cnas-process/src/main/resources/mapper/ProcessMethodSearchNewMapper.xml
index 7be9498..d446e4d 100644
--- a/cnas-process/src/main/resources/mapper/ProcessMethodSearchNewMapper.xml
+++ b/cnas-process/src/main/resources/mapper/ProcessMethodSearchNewMapper.xml
@@ -8,6 +8,7 @@
from (select *
from cnas_process_method_search_new
<where>
+ and is_auto_archived = 0
<if test="beginDate != null and beginDate != '' and endDate != null and endDate != ''">
and create_time between #{beginDate} and #{endDate}
</if>
@@ -18,4 +19,16 @@
${ew.customSqlSegment}
</if>
</select>
+
+ <select id="pageAutoArchived" resultType="com.ruoyi.process.pojo.ProcessMethodSearchNew">
+ select *
+ from (
+ select * from cnas_process_method_search_new
+ where is_auto_archived = 1
+ order by auto_archived_time desc, method_search_new_id desc
+ ) a
+ <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
+ ${ew.customSqlSegment}
+ </if>
+ </select>
</mapper>
--
Gitblit v1.9.3