|
@@ -278,7 +278,10 @@ public class ActivityEvaluationRecordServiceImpl extends ServiceImpl<ActivityEva
|
|
}
|
|
}
|
|
Subject subject = subjectService.get(subjectId);
|
|
Subject subject = subjectService.get(subjectId);
|
|
|
|
|
|
- userRanking.setUserSubject(Optional.ofNullable(subject).map(Subject::getName).orElse(""));
|
|
|
|
|
|
+ if (Objects.nonNull(userRanking)) {
|
|
|
|
+
|
|
|
|
+ userRanking.setUserSubject(Optional.ofNullable(subject).map(Subject::getName).orElse(""));
|
|
|
|
+ }
|
|
|
|
|
|
} else {
|
|
} else {
|
|
|
|
|