From 3c633caa438147d94cbc37993b818766de06aafb Mon Sep 17 00:00:00 2001
From: heheng <heheng@123456>
Date: 星期三, 27 十一月 2024 16:17:56 +0800
Subject: [PATCH] 部分修改

---
 expert-system/src/main/resources/mapper/system/ProjectExpertMapper.xml |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/expert-system/src/main/resources/mapper/system/ProjectExpertMapper.xml b/expert-system/src/main/resources/mapper/system/ProjectExpertMapper.xml
index e4476e1..153b0f2 100644
--- a/expert-system/src/main/resources/mapper/system/ProjectExpertMapper.xml
+++ b/expert-system/src/main/resources/mapper/system/ProjectExpertMapper.xml
@@ -134,7 +134,7 @@
                b.selection_mode selectionMode,b.team_leader teamLeader,b.score,b.evaluation_state evaluationState
         from  project_expert b
                  left join sys_expert_info c on b.expert_id = c.id
-        where b.project_id = #{projectId}
+        where b.del_flag = 0 and  b.project_id = #{projectId}
         order by b.team_leader asc , b.selection_mode asc, b.create_time desc
     </select>
 
@@ -146,7 +146,8 @@
         from project_management a
                  left join project_expert b on a.id = b.project_id and b.del_flag = 0
                  left join sys_expert_info c on b.expert_id = c.id
-        where 1=1
+        where 1=1 and b.evaluation_state = 1
+        <if test="deptId != null "> and a.dept_id = #{deptId}</if>
         <if test="projectName != null  and projectName != ''"> and a.project_name like concat('%', #{projectName}, '%')</if>
         <if test="name != null and name != ''">
             and c.name like concat('%', #{name}, '%')

--
Gitblit v1.9.2