Merge branch 'saas' into test

mec-application/src/main/java/com/ym/mec/student/controller/StudentManageController.java

@@ -195,13 +195,6 @@ public class StudentManageController extends BaseController {
 			List<Subject> subjectList = subjectService.findBySubjectByIdList(student.getSubjectIdList());
 			student.setSubjectNames(subjectList.stream().map(t -> t.getName()).collect(Collectors.joining(",")));
 		}
-		
-		if(StringUtils.isNotBlank(student.getExtSubjectIds())){
-			List<Subject> subjectList = subjectService.findBySubjectByIdList(student.getExtSubjectIds());
-			
-			student.setExtSjectNamesMap(subjectList.stream().collect(Collectors.toMap(Subject :: getId, Subject :: getName)));
-		}
-
         List<CloudTeacherOrder> dataList = cloudTeacherOrderDao.queryByUserIdAndStatus(user.getId(),1);
         if(dataList != null && dataList.size() > 0){
         	datas.put("isExistPendingMember", true);

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

@@ -1332,6 +1332,11 @@ public class StudentManageServiceImpl implements StudentManageService {
         // 学员会员信息
         datas.put("vipInfo", cloudTeacherOrderService.getEffectiveCloudTeacherOrder(Lists.newArrayList(student.getUserId())));
 
+        if(StringUtils.isNotBlank(student.getExtSubjectIds())){
+            List<Subject> subjectList = subjectService.findBySubjectByIdList(student.getExtSubjectIds());
+
+            student.setExtSjectNamesMap(subjectList.stream().collect(Collectors.toMap(Subject :: getId, Subject :: getName)));
+        }
 
         // 通过学生声部换乐器ID
         if (StringUtils.isNotBlank(student.getSubjectIdList())) {