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/TProjectProposalMapper.xml |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/TProjectProposalMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TProjectProposalMapper.xml
index 2b3f64a..751a8a3 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TProjectProposalMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TProjectProposalMapper.xml
@@ -59,6 +59,9 @@
             <if test="query.auditStatus != null">
                 AND tpp.audit_status = #{query.auditStatus}
             </if>
+            <if test="query.roleType != null and (query.roleType == 3 or query.roleType == 4 or query.roleType == 5)">
+                AND tpp.audit_status != 5
+            </if>
              <if test="query.teamIds != null and query.teamIds.size() > 0">
                 AND tpp.team_id IN
                 <foreach item="teamId" collection="query.teamIds" separator="," open="(" close=")" index="">

--
Gitblit v1.7.1