From 518c23c82b1ea9907cca853024ce812d3744ad35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com>
Date: Wed, 4 Nov 2020 16:19:32 +0800
Subject: [PATCH] fix

---
 .../lz/modules/flow/dao/EvaluationGroupMapper.java    |  2 +-
 .../flow/service/impl/EvaluationGroupServiceImpl.java | 11 +++++++----
 .../service/impl/AssessManagerServiceImpl.java        |  2 +-
 .../resources/mapper/flow/EvaluationGroupMapper.xml   |  2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/lz/modules/flow/dao/EvaluationGroupMapper.java b/src/main/java/com/lz/modules/flow/dao/EvaluationGroupMapper.java
index c99522e2..9f93486f 100644
--- a/src/main/java/com/lz/modules/flow/dao/EvaluationGroupMapper.java
+++ b/src/main/java/com/lz/modules/flow/dao/EvaluationGroupMapper.java
@@ -47,6 +47,6 @@ public interface EvaluationGroupMapper extends BaseMapper<EvaluationGroup> {
 
 	List<Long> selectIdsByCopyIds(@Param("copyIds")String copyIds);
 
-	EvaluationGroup selectEvaluationGroupByCopyId(@Param("copyId")String copyId);
+	EvaluationGroup selectEvaluationGroupByCopyId(@Param("copyId")Long copyId,@Param("startId")Long startId);
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java
index d3e63028..ac58fc0a 100644
--- a/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java
+++ b/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java
@@ -135,11 +135,14 @@ public class EvaluationGroupServiceImpl extends ServiceImpl<EvaluationGroupMappe
 			group.setCounts(ids.size());
 			//是否通知评分
 			if(req.getStartId()!=null){
-				EvaluationGroup scoreGroup = evaluationGroupMapper.selectEvaluationGroupByCopyId(String.valueOf(group.getId()));
-				int i = evaluationStartStaffMapper.existByStartIdAndEvaluationId(req.getStartId(),scoreGroup.getId());
-				if(i>0){
-					group.setScore(1);
+				EvaluationGroup scoreGroup = evaluationGroupMapper.selectEvaluationGroupByCopyId(group.getId(),req.getStartId());
+				if(scoreGroup!=null){
+					int i = evaluationStartStaffMapper.existByStartIdAndEvaluationId(req.getStartId(),scoreGroup.getId());
+					if(i>0){
+						group.setScore(1);
+					}
 				}
+
 			}
 		}
 		return pageUtils;
diff --git a/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java
index 892727a9..5e1600b7 100644
--- a/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java
+++ b/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java
@@ -259,7 +259,7 @@ public class AssessManagerServiceImpl implements AssessManagerService {
         List<StaffSimpleInfo> toStaffids  = new ArrayList<>();
         for(String s:split){
             //更新评分
-            EvaluationGroup group = evaluationGroupMapper.selectEvaluationGroupByCopyId(s);
+            EvaluationGroup group = evaluationGroupMapper.selectEvaluationGroupByCopyId(Long.valueOf(s),req.getStartId());
             if(group==null){
                 log.info("未找到主组信息，copyId: " + s);
                 continue;
diff --git a/src/main/resources/mapper/flow/EvaluationGroupMapper.xml b/src/main/resources/mapper/flow/EvaluationGroupMapper.xml
index 51ae9d0f..80e44514 100644
--- a/src/main/resources/mapper/flow/EvaluationGroupMapper.xml
+++ b/src/main/resources/mapper/flow/EvaluationGroupMapper.xml
@@ -158,7 +158,7 @@
     </select>
 
     <select id="selectEvaluationGroupByCopyId" resultType="EvaluationGroup" >
-         select * from lz_evaluation_group  where  is_delete = 0 and copy_id = #{copyId}
+         select * from lz_evaluation_group  where  is_delete = 0 and copy_id = #{copyId} and start_id = #{startId}
     </select>
 </mapper>