From 253bc07ec58e8d47c167ee9ffbb5a517113e4330 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Wed, 24 Jul 2024 15:53:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mappers/basis/ExamineMapper.xml      | 2 +-
 src/main/resources/mappers/basis/ExperimentalMapper.xml | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mappers/basis/ExamineMapper.xml b/src/main/resources/mappers/basis/ExamineMapper.xml
index 01948cd..4a189a0 100644
--- a/src/main/resources/mappers/basis/ExamineMapper.xml
+++ b/src/main/resources/mappers/basis/ExamineMapper.xml
@@ -76,7 +76,7 @@
             AND ts.team_id = -1
         </if>
         /*班组长-审阅*/
-        <if test="roleCode == 'experimentalTeam'">
+        <if test="roleCode == 'experimentalTeamLeader'">
             AND process_status = 1 AND audti_status = 0
         </if>
         /*技术负责人-审核*/
diff --git a/src/main/resources/mappers/basis/ExperimentalMapper.xml b/src/main/resources/mappers/basis/ExperimentalMapper.xml
index 5e3a913..9843c1e 100644
--- a/src/main/resources/mappers/basis/ExperimentalMapper.xml
+++ b/src/main/resources/mappers/basis/ExperimentalMapper.xml
@@ -298,8 +298,15 @@
             AND INSTR(tsd.sampleDevCode,#{devTypeCode})
         </if>
         <if test="roleCode != 'administrators'">
+          /*试验班组成员-待试验/待提交/审阅不通过展示/审核不通过展示/审批不通过展示*/
             <if test="roleCode == 'experimentalTeamMember' and teamId != null">
-                AND ts.team_id = #{teamId}
+                AND ts.team_id = #{teamId} AND (
+                (ts.process_status IS NULL AND audti_status = 0) OR
+                (ts.process_status = 1 AND audti_status = 0) OR
+                (ts.process_status = 1 AND audti_status = 2) OR
+                (ts.process_status = 2 AND audti_status = 2) OR
+                (ts.process_status = 3 AND audti_status = 2)
+                )
             </if>
             <if test="(roleCode != 'experimentalTeamMember') or (roleCode == 'experimentalTeamMember' and teamId == null)">
                 AND ts.team_id = -1