Merge branch 'activity_v1.3.5_20220929'

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ActivityEvaluationRecordServiceImpl.java

@@ -278,7 +278,10 @@ public class ActivityEvaluationRecordServiceImpl extends ServiceImpl<ActivityEva
             }
             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 {