update

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

@@ -188,11 +188,11 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         }
 
         // 保存乐团声部规划
-        if (musicGroupSubjectPlans != null) {
+        if (musicGroupSubjectPlans != null && musicGroupSubjectPlans.size() > 0) {
             musicGroupSubjectPlanDao.batchAdd(musicGroupSubjectPlans,musicGroupId);
         }
         // 保存乐团声部商品规划
-        if (musicGroupSubjectGoodsGroups != null) {
+        if (musicGroupSubjectGoodsGroups != null && musicGroupSubjectGoodsGroups.size() > 0) {
             musicGroupSubjectGoodsGroupDao.batchInsert(musicGroupSubjectGoodsGroups,musicGroupId);
         }
         return musicGroupId;

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

@@ -321,7 +321,7 @@
         LEFT JOIN sys_user su ON cgsm.user_id_=su.id_
         LEFT JOIN music_group mg ON cg.music_group_id_=mg.id_
         LEFT JOIN `subject` s ON cg.subject_id_=s.id_
-        WHERE cgsm.class_group_id_=#{classID} AND cgsm.status_ != 'QUIT'
+        WHERE cgsm.class_group_id_=#{classID} AND cgsm.status_ != 'QUIT' AND cg.group_type_ = 'MUSIC'
     </select>
 
     <select id="countStudentInClass" resultType="java.lang.Integer">
@@ -399,9 +399,8 @@
             LEFT JOIN course_schedule cs ON cg.id_ = cs.class_group_id_
             LEFT JOIN sys_user su ON cs.teacher_id_=su.id_
             LEFT JOIN teacher_attendance ta ON cs.id_=ta.class_group_id_ AND ta.teacher_id_=cs.teacher_id_
-        WHERE
-            mg.organ_id_ = #{organId}
-        AND cs.id_ IS NOT NULL
+        WHERE mg.organ_id_ = #{organId}
+        AND cs.id_ IS NOT NULL AND cg.group_type_ = 'MUSIC'
         AND cs.class_date_ = DATE_FORMAT(#{date},'%Y-%m-%d')
         <include refid="global.limit"/>
     </select>
@@ -413,9 +412,8 @@
         music_group mg
         LEFT JOIN class_group cg ON mg.id_ = cg.music_group_id_
         LEFT JOIN course_schedule cs ON cg.id_ = cs.class_group_id_
-        WHERE
-        mg.organ_id_ = #{organId}
-        AND cs.id_ IS NOT NULL
+        WHERE mg.organ_id_ = #{organId}
+        AND cs.id_ IS NOT NULL AND cg.group_type_ = 'MUSIC'
         AND cs.class_date_ = DATE_FORMAT(#{date},'%Y-%m-%d')
     </select>
 
@@ -493,7 +491,7 @@
         course_schedule cs
         LEFT JOIN class_group cg ON cs.class_group_id_=cg.id_
         WHERE DATE_FORMAT(cs.class_date_,'%Y%m')=DATE_FORMAT(#{month},'%Y%m')
-        AND cg.music_group_id_=#{musicGroupID}
+        AND cg.music_group_id_=#{musicGroupID} AND cg.group_type_ = 'MUSIC'
         GROUP BY cs.class_date_
     </select>
 

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

@@ -531,7 +531,9 @@
         SELECT sr.user_id_,sr.parents_name_,sr.parents_phone_,sr.current_grade_,
         sr.current_class_,su.username_ name_,su.birthdate_,su.gender_
         FROM student_registration sr
-        LEFT JOIN sys_user su ON sr.user_id_ = su.id_ LIMIT 1
+        LEFT JOIN sys_user su ON sr.user_id_ = su.id_
+        WHERE sr.parents_phone_ = #{mobile}
+        LIMIT 1
     </select>
 
     <update id="updateUser">