zouxuan преди 5 години
родител
ревизия
d4d401eb96
променени са 1 файла, в които са добавени 2 реда и са изтрити 2 реда
  1. 2 2
      mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentManageServiceImpl.java

+ 2 - 2
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());