Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupServiceImpl.java

@@ -714,7 +714,9 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         }
         //获取相关老师
         teacherIds.addAll(classGroupDao.findGroupTeacher(groupId));
-        students.addAll(teacherDao.queryTeacherImModel(teacherIds));
+        if(teacherIds.size() > 0){
+            students.addAll(teacherDao.queryTeacherImModel(teacherIds));
+        }
         return students;
     }
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentManageServiceImpl.java

@@ -122,10 +122,10 @@ public class StudentManageServiceImpl implements StudentManageService {
             Map<Integer,String> subjectNames = MapUtil.convertMybatisMap(studentManageDao.querySubjectNames(userIds));
             dataList.forEach(e -> {
                 e.setOrganName(organNames.get(e.getOrganId()));
-                e.setMusicGroupName(musicGroupNames.get(e.getUserId())==null?musicGroupNames.get(e.getUserId().longValue()):null);
+                e.setMusicGroupName(musicGroupNames.get(e.getUserId().longValue()));
                 e.setVipGroupName(vipGroupNames.get(e.getUserId()));
                 e.setSubjectName(subjectNames.get(e.getUserId()));
-                e.setMusicGroupStatus(musicGroupStatus.get(e.getUserId())==null?musicGroupStatus.get(e.getUserId().longValue()):null);
+                e.setMusicGroupStatus(musicGroupStatus.get(e.getUserId().longValue()));
                 e.setVipGroupStatus(vipGroupStatus.get(e.getUserId()));
                 if(hasCourse == null){
                     Integer course = studentManageDao.getHasCourse(e.getUserId());

mec-biz/src/main/resources/config/mybatis/TeacherMapper.xml

@@ -799,7 +799,7 @@
     </select>
     <select id="queryTeacherImModel" resultMap="com.ym.mec.biz.dal.dao.MusicGroupDao.ImUserModel">
         SELECT su.id_,su.avatar_,
-        CASE WHEN su.username_ IS NULL THEN su.real_name_ ELSE su.username_ END username_
+        CASE WHEN su.username_ IS NULL THEN su.real_name_ END username_
         FROM sys_user su
         WHERE su.id_ IN
         <foreach collection="teacherIds" item="userId" open="(" close=")" separator=",">