Merge branch 'mec_update_2021-11-02' of http://git.dayaedu.com/yonge/mec

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

@@ -811,12 +811,18 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         studentRegistration.setCreateTime(date);
         studentRegistration.setUpdateTime(date);
 
-        StudentRegistration phoneAndMusicGroupId = studentRegistrationDao.getByPhoneAndMusicGroupId(musicGroupId, studentRegistration.getParentsPhone());
+        SysUser sysUser = studentRegistrationDao.getSysUserByPhone(studentRegistration.getParentsPhone());
+        StudentRegistration phoneAndMusicGroupId = null;
+        if(sysUser != null){
+            phoneAndMusicGroupId = studentRegistrationDao.getByUserIdAndMusicGroupId(musicGroupId, sysUser.getId());
+        }else {
+            phoneAndMusicGroupId = studentRegistrationDao.getByPhoneAndMusicGroupId(musicGroupId, studentRegistration.getParentsPhone());
+        }
+
         if (phoneAndMusicGroupId != null && phoneAndMusicGroupId.getMusicGroupStatus() != StudentMusicGroupStatusEnum.QUIT && phoneAndMusicGroupId.getMusicGroupStatus() != StudentMusicGroupStatusEnum.APPLY) {
             throw new BizException("该学员已存在");
         }
 
-        SysUser sysUser = studentRegistrationDao.getSysUserByPhone(studentRegistration.getParentsPhone());
         MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
         Integer userId;
         if (sysUser == null) {

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

@@ -320,6 +320,7 @@
 		SELECT COUNT(ch.id_)
 		FROM course_homework ch
 		LEFT JOIN course_schedule cs ON cs.id_ = ch.course_schedule_id_
+		LEFT JOIN sys_user su ON su.id_ = cs.actual_teacher_id_
 		LEFT JOIN organization o ON o.id_ = cs.organ_id_
 		<if test="groupType == 'MUSIC'">
 			LEFT JOIN music_group mg ON mg.id_ = cs.music_group_id_