From bd953391a74b86db829df43992c7cf3c5207634b Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 27 六月 2025 18:07:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-system/src/main/resources/mapper/system/TTestMethodConfirmSheetMapper.xml |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/TTestMethodConfirmSheetMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TTestMethodConfirmSheetMapper.xml
index 56466c7..c090ee2 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TTestMethodConfirmSheetMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TTestMethodConfirmSheetMapper.xml
@@ -44,6 +44,9 @@
             <if test="query.auditStatus != null">
                 and tmcs.audit_status = #{query.auditStatus}
             </if>
+            <if test="query.roleType != null and (query.roleType == 3 or query.roleType == 4 or query.roleType == 5)">
+                AND tmcs.audit_status != 5
+            </if>
             <if test="query.dispatchIds != null and query.dispatchIds.size() > 0">
                 and tmcs.dispatch_id in
                 <foreach item="item" collection="query.dispatchIds" separator="," close=")" index="index" open="(">

--
Gitblit v1.7.1