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

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

@@ -86,7 +86,7 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
 //				exercisesSituationDto.setExpectExercisesNum((int) until+1);
 				List<UserGroupDto> userGroupDtos = userGroupsMap.get(exercisesSituationDto.getStudentId());
 				if(!CollectionUtils.isEmpty(userGroupDtos)){
-					exercisesSituationDto.setGroupNames(userGroupDtos.stream().map(UserGroupDto::getGroupName).collect(Collectors.joining(",")));
+					exercisesSituationDto.setGroupNames(userGroupDtos.stream().map(UserGroupDto::getGroupName).sorted().collect(Collectors.joining(",")));
 				}
 				List<StudentEduTeacherDto> studentEduTeachers = studentEduTeachersMap.get(exercisesSituationDto.getStudentId());
 				if(!CollectionUtils.isEmpty(studentEduTeachers)){

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

@@ -591,7 +591,7 @@ public class StudentManageServiceImpl implements StudentManageService {
             for (Student4operating student4operating : dataList) {
                 List<UserGroupDto> userGroupDtos = userGroupsMap.get(student4operating.getStudentId());
                 if(!CollectionUtils.isEmpty(userGroupDtos)){
-                    student4operating.setGroupNames(userGroupDtos.stream().map(UserGroupDto::getGroupName).collect(Collectors.joining(",")));
+                    student4operating.setGroupNames(userGroupDtos.stream().map(UserGroupDto::getGroupName).sorted().collect(Collectors.joining(",")));
                 }
             }
         }