|
@@ -224,12 +224,13 @@ public class QualificationApplyRepository extends ServiceImpl<QualificationApply
|
|
|
//List<QualificationApplyAdjust> applyAdjustList = listApplyAdjust.stream().filter(a -> a.getQualificationApplyId().equals(apply.getId())).collect(Collectors.toList());
|
|
|
List<QualificationApplyAdjust> applyAdjustList = qualificationApplyAdjustMap.get(apply.getId());
|
|
|
|
|
|
- //调整历史-调整人姓名
|
|
|
- for(QualificationApplyAdjust adjust : applyAdjustList){
|
|
|
- adjust.setAdjustUserName(empMap.get(adjust.getUserId()).getName());
|
|
|
+ if(applyAdjustList != null) {
|
|
|
+ //调整历史-调整人姓名
|
|
|
+ for(QualificationApplyAdjust adjust : applyAdjustList){
|
|
|
+ adjust.setAdjustUserName(empMap.get(adjust.getUserId()).getName());
|
|
|
+ }
|
|
|
+ apply.setApplyAdjust(applyAdjustList);
|
|
|
}
|
|
|
-
|
|
|
- apply.setApplyAdjust(applyAdjustList);
|
|
|
}
|
|
|
|
|
|
list.sort((Comparator.comparing(QualificationApply::getCurrentStatus, Comparator.reverseOrder()).thenComparing(QualificationApply::getApplyDate, Comparator.reverseOrder())));
|