|
|
@ -252,7 +252,7 @@ public class AdminAppraiseServiceImpl implements AdminAppraiseService {
|
|
|
|
List<String> names = rankVoList.stream().map(AppraiseNodeRankVo::getName).collect(Collectors.toList());
|
|
|
|
List<String> names = rankVoList.stream().map(AppraiseNodeRankVo::getName).collect(Collectors.toList());
|
|
|
|
// 去重后的 nodes
|
|
|
|
// 去重后的 nodes
|
|
|
|
List<AppraiseTreeNode> nodesByName = appraiseRecordRepository.findAppraiseRecordInNames(String.format(PK.PK_APPRAISE_RECORD, schoolId), academicYearId, names);
|
|
|
|
List<AppraiseTreeNode> nodesByName = appraiseRecordRepository.findAppraiseRecordInNames(String.format(PK.PK_APPRAISE_RECORD, schoolId), academicYearId, names);
|
|
|
|
// 正常情况下 name 一一对应
|
|
|
|
// 正常情况下 name 一一对应 todo: 临时解决
|
|
|
|
Map<String, AppraiseTreeNode> nameNodeMap = nodesByName.stream().collect(Collectors.toMap(AppraiseTreeNode::getName, item -> item, (existing, replacement) -> {
|
|
|
|
Map<String, AppraiseTreeNode> nameNodeMap = nodesByName.stream().collect(Collectors.toMap(AppraiseTreeNode::getName, item -> item, (existing, replacement) -> {
|
|
|
|
if (replacement.getPath() != null) {
|
|
|
|
if (replacement.getPath() != null) {
|
|
|
|
return replacement;
|
|
|
|
return replacement;
|
|
|
|