Переглянути джерело

Merge branch 'feature_HW_20230331' of http://git.dayaedu.com/yonge/mec into master_saas

zouxuan 2 роки тому
батько
коміт
e06c3fbd44

+ 1 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/LessonExaminationServiceImpl.java

@@ -120,7 +120,7 @@ public class LessonExaminationServiceImpl extends ServiceImpl<LessonExaminationD
         userMap.put(param.getTeacherId(), param.getTeacherId().toString());
         String notifyUrl = "evaluating?evaluateId=" + lessonExamination.getId();
         String extra = "dayaedu" + notifyUrl + "&type=evaluating&evaluateId=" + lessonExamination.getId();
-        String[] strings = studentIds.toArray(new String[]{});
+        String[] strings = studentIds.toArray(new String[studentIds.size()]);
         sysMessageService.batchSendImMessage(MessageTypeEnum.IM_PUBLISH_LESSON_EXAMINATION,param.getTeacherId().toString(), extra,
                 strings,null, teacherName);
         sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_PUBLISH_LESSON_EXAMINATION,

+ 1 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentExtracurricularExercisesSituationServiceImpl.java

@@ -856,7 +856,7 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
                     // 设置老师信息
                     SysUser sysUser = sysUserFeignService.queryUserById(courseHomeworkList.getTeacherId());
                     if (Objects.nonNull(sysUser)) {
-                        courseHomeworkList.setTeacherName(sysUser.getUsername());
+                        courseHomeworkList.setTeacherName(sysUser.getRealName());
                         courseHomeworkList.setTeacherImg(sysUser.getAvatar());
                     }
                 }