Merge branch 'zx_saas_sort' of http://git.dayaedu.com/yonge/mec into test

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

@@ -2442,12 +2442,12 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
         MusicGroupStudentClassAdjust classAdjust = musicGroupStudentClassAdjustDao.get(classGroup4MixDto.getMusicGroupStudentClassAdjustId());
         ClassGroup classGroup = classGroup4MixDto.getClassGroup();
+        List<ClassGroupStudentMapper> classGroupStudentMapperList = new ArrayList<>();
         if (classGroup == null) {
             //建班
             classGroup = createClassGroup(classGroup4MixDto);
             classGroup4MixDto.setClassGroup(classGroup);
             //2、将学生加入新班级（学生注册表，关联表
-            List<ClassGroupStudentMapper> classGroupStudentMapperList = new ArrayList<>();
             List<Integer> userIds = new ArrayList<>(); //用户ids
             for (StudentRegistration studentRegistration : studentList) {
                 if (classGroup4MixDto.getType().equals(ClassGroupTypeEnum.NORMAL)) {
@@ -2466,7 +2466,6 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
                 userIds.add(studentRegistration.getUserId());
             }
-            classGroupStudentMapperDao.classGroupStudentsInsert(classGroupStudentMapperList);
 
             List<Integer> teacherIds = new ArrayList<>();
             for (ClassGroupTeacherMapper groupTeacherMapper : classGroupTeacherMapperList) {
@@ -2485,7 +2484,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         getCourseSchedules(classGroup4MixDto, courseScheduleList, classAdjust);
 
         //自动排课，校验冲突
-        if (courseScheduleList.size() > 0) {
+        if (CollectionUtils.isNotEmpty(courseScheduleList)) {
             //冲突校验
             courseScheduleList = autoAdjust(classGroup4MixDto, courseScheduleList, classAdjust);
 
@@ -2511,9 +2510,11 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                     courseScheduleTeacherSalaryList.add(courseScheduleTeacherSalary);
                 }
             }
-
+            if (CollectionUtils.isNotEmpty(classGroupStudentMapperList)){
+                classGroupStudentMapperDao.classGroupStudentsInsert(classGroupStudentMapperList);
+            }
             //老师结算表
-            if (courseScheduleTeacherSalaryList.size() > 0) {
+            if (CollectionUtils.isNotEmpty(courseScheduleTeacherSalaryList)) {
                 courseScheduleTeacherSalaryService.batchInsert(courseScheduleTeacherSalaryList);
             }
             Integer musicGroupStudentClassAdjustId = classGroup4MixDto.getMusicGroupStudentClassAdjustId();

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

@@ -148,7 +148,9 @@
 		LEFT JOIN sys_user su ON ses.create_user_id_ = su.id_
 		<include refid="queryPageSql"/>
 		GROUP BY ses.id_
-		ORDER BY ses.cbs_music_categories_id_ DESC,ses.order_ ASC,ses.create_time_ DESC,ses.id_ desc
+		ORDER BY CONVERT(ses.name_ USING gbk) COLLATE gbk_chinese_ci,
+		ses.name_ COLLATE utf8mb4_bin,
+		ses.name_ REGEXP '^[0-9]' DESC, ses.create_time_ DESC
 		<include refid="global.limit"/>
 	</select>