fix
This commit is contained in:
parent
de859ed647
commit
c877ae244b
@ -312,9 +312,9 @@ public class EvaluationGroupServiceImpl extends ServiceImpl<EvaluationGroupMappe
|
||||
List<String> staffs = map.get(evaluationGroup12.getId());
|
||||
staffs.retainAll(collect);
|
||||
if(CollectionUtils.isNotEmpty(staffs)){
|
||||
//直接添加
|
||||
addStaffsToAssessGroup(collect,evaluationGroup12.getId());
|
||||
removeStaffsToAssessGroup(collect,evaluationGroup12.getId());
|
||||
//添加到保存时添加
|
||||
//删除存在得
|
||||
removeStaffsToAssessGroup(collect,evaluationGroup12);
|
||||
}
|
||||
|
||||
});
|
||||
@ -325,13 +325,17 @@ public class EvaluationGroupServiceImpl extends ServiceImpl<EvaluationGroupMappe
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
private int addStaffsToAssessGroup(List<Long> ids,Long id) {
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
private int removeStaffsToAssessGroup(List<Long> ids,Long id) {
|
||||
|
||||
private int removeStaffsToAssessGroup(List<Long> ids,EvaluationGroup group) {
|
||||
String staffIds = group.getStaffIds();
|
||||
if(StringUtil.isNotBlank(staffIds)){
|
||||
String[] split = staffIds.split(",");
|
||||
Set<String> set = new HashSet(Arrays.asList(split));
|
||||
set.removeAll(new HashSet(ids)); //set.addAll(new HashSet(ids));
|
||||
String join = StringUtils.join(set, ",");
|
||||
group.setStaffIds(join);
|
||||
int i = evaluationGroupMapper.updateCoverEvaluationGroupById(group);
|
||||
return i;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user