From 401bf91d680c21c41ce34b65bb6b1b16a39be2fb 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, 11 Nov 2020 10:47:13 +0800
Subject: [PATCH] fix

---
 .../service/impl/AssessManagerServiceImpl.java     | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

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 a0dd2dd2..d0177167 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
@@ -188,7 +188,7 @@ public class AssessManagerServiceImpl implements AssessManagerService {
         String[] split = flowStart.getGroupIds().split(",");
         List<String> strings = Arrays.asList(split);
         List<Long> ids = strings.stream().map(s -> Long.valueOf(s)).collect(toList());
-        List<EvaluationGroup> otheEvaluationGroups = evaluationGroupService.selectEvaluationGroupByNotIds(ids);
+        List<EvaluationGroup> evaluationGroups = evaluationGroupService.selectEvaluationGroupByIds(ids);
 
         //获取变更人员
         String[] changeStaffIds = req.getStaffIds().split(",");
@@ -200,7 +200,7 @@ public class AssessManagerServiceImpl implements AssessManagerService {
 
             //根据组id成员分组
             Map<Long,List<String>> map = Maps.newHashMap();
-            for(EvaluationGroup group:otheEvaluationGroups){
+            for(EvaluationGroup group:evaluationGroups){
                 List<String> staff = evaluationGroupService.selectAllStaffIdsByGroupId(group.getId());
                 all.addAll(staff);
                 map.put(group.getId(),staff);
@@ -227,7 +227,7 @@ public class AssessManagerServiceImpl implements AssessManagerService {
             //排除已发起过的
             List<Long> longs = evaluationStartStaffMapper.selectStaffIdsByStart(req.getStartId());
 
-            for(EvaluationGroup group:otheEvaluationGroups){
+            for(EvaluationGroup group:evaluationGroups){
                 GroupStaffs groupStaffs = new GroupStaffs();
                 groupStaffs.setEvaluationGroup(group);
 
@@ -240,11 +240,17 @@ public class AssessManagerServiceImpl implements AssessManagerService {
                     groupS.add(groupStaffs);
                 }
             }
+            if(CollectionUtils.isEmpty(groupS)){
+                log.info("暂无人员需要添加");
+                return R.ok("暂无人员需要添加");
+            }
 
             StartGroups startGroups = new StartGroups();
             startGroups.setStartId(req.getStartId());
             startGroups.setGroups(groupS);
-            return flowStartService.startStaffs(startGroups);
+            R r = flowStartService.startStaffs(startGroups);
+            log.info("添加人员初始化返回：" + JSON.toJSONString(r));
+            return r;
 
         }
         if(req.getChangeType() == 1){