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 strings = Arrays.asList(split); List ids = strings.stream().map(s -> Long.valueOf(s)).collect(toList()); - List otheEvaluationGroups = evaluationGroupService.selectEvaluationGroupByNotIds(ids); + List evaluationGroups = evaluationGroupService.selectEvaluationGroupByIds(ids); //获取变更人员 String[] changeStaffIds = req.getStaffIds().split(","); @@ -200,7 +200,7 @@ public class AssessManagerServiceImpl implements AssessManagerService { //根据组id成员分组 Map> map = Maps.newHashMap(); - for(EvaluationGroup group:otheEvaluationGroups){ + for(EvaluationGroup group:evaluationGroups){ List staff = evaluationGroupService.selectAllStaffIdsByGroupId(group.getId()); all.addAll(staff); map.put(group.getId(),staff); @@ -227,7 +227,7 @@ public class AssessManagerServiceImpl implements AssessManagerService { //排除已发起过的 List 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){