Merge remote-tracking branch 'origin/master'

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

@@ -84,7 +84,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).sorted().collect(Collectors.joining(",")));
+					exercisesSituationDto.setGroupNames(userGroupDtos.stream().filter(ug->StringUtils.isNotBlank(ug.getGroupName())).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

@@ -714,7 +714,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).sorted().collect(Collectors.joining(",")));
+                    student4operating.setGroupNames(userGroupDtos.stream().filter(ug->StringUtils.isNotBlank(ug.getGroupName())).map(UserGroupDto::getGroupName).sorted().collect(Collectors.joining(",")));
                 }
             }
         }

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

@@ -137,8 +137,8 @@ public class TeacherDefaultMusicGroupSalaryServiceImpl extends BaseServiceImpl<L
 											throw new BizException("课酬设置不完整");
 										}
 										Integer studentNum = classGroupStudentNumMap.get(ts.getClassGroupId());
-										if(studentNum == null || studentNum == 0){
-											studentNum = 1;
+										if(studentNum == null){
+											studentNum = 0;
 										}
 										if(studentNum>5){
 											studentNum = 5;
@@ -170,8 +170,8 @@ public class TeacherDefaultMusicGroupSalaryServiceImpl extends BaseServiceImpl<L
 											classGroupStudentNumMap.put(ts.getClassGroupId(), strs.length);
 										}
 										Integer studentNum = classGroupStudentNumMap.get(ts.getClassGroupId());
-										if(studentNum == null || studentNum == 0){
-											studentNum = 1;
+										if(studentNum == null){
+											studentNum = 0;
 										}
 										ts.setExpectSalary(ts.getExpectSalary().multiply(new BigDecimal(studentNum)));
 									}
@@ -200,8 +200,8 @@ public class TeacherDefaultMusicGroupSalaryServiceImpl extends BaseServiceImpl<L
 											classGroupStudentNumMap.put(ts.getClassGroupId(), strs.length);
 										}
 										Integer studentNum = classGroupStudentNumMap.get(ts.getClassGroupId());
-										if(studentNum == null || studentNum == 0){
-											studentNum = 1;
+										if(studentNum == null){
+											studentNum = 0;
 										}
 										ts.setExpectSalary(ts.getExpectSalary().multiply(new BigDecimal(studentNum)));
 									}

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

@@ -190,7 +190,7 @@
 				AND cgsm.class_group_id_ = #{classGroupId}
 			</if>
 			<if test="subjectId!=null">
-				AND FIND_IN_SET(stu.subject_id_list_, #{subjectId})
+				AND FIND_IN_SET(#{subjectId}, stu.subject_id_list_)
 			</if>
 			<if test="search!=null">
 				AND (su.username_ LIKE CONCAT('%', #{search}, '%') OR su.phone_ LIKE CONCAT(#{search}, '%'))

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

@@ -635,7 +635,7 @@
             DISTINCT sub.*
         FROM
             student stu
-            LEFT JOIN `subject` sub ON FIND_IN_SET( stu.subject_id_list_, sub.id_ )
+            LEFT JOIN `subject` sub ON FIND_IN_SET( sub.id_, stu.subject_id_list_ )
         WHERE
             stu.user_id_ IN
             <foreach collection="studentIds" item="studentId" open="(" close=")" separator=",">