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

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

@@ -825,7 +825,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 registration = studentRegistration;
 
                 //增加报名学生数
-                musicGroupSubjectPlanService.addApplyStudentNum(newMusicGroupId, studentRegistration.getSubjectId(), 1);
+                musicGroupSubjectPlanService.addApplyStudentNum(newMusicGroupId, studentRegistration.getActualSubjectId(), 1);
                 //新增Fee表
                 MusicGroupStudentFee musicGroupStudentFee = musicGroupStudentFeeDao.findByUser(studentRegistration.getUserId(),newMusicGroupId);
                 if(musicGroupStudentFee == null){

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

@@ -236,6 +236,7 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 		return teachers.stream().distinct().collect(Collectors.toList());
 	}
 
+	@Transactional(rollbackFor = Exception.class)
 	public void queryGroupStudents1(Integer teacherId, String search) {
 		//获取关联的学员列表
 		Set<Integer> studentIds = teacherDao.queryCourseClassStudentIds(teacherId);
@@ -295,10 +296,12 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 		if(studentIds.size() > 0){
 			teachers.addAll(teacherDao.queryTeacherBaseInfo(studentIds,search));
 		}
-		//删除现有的用户通讯录
-		imUserFriendDao.deleteByUserId(teacherId);
-		//批量新增
-		imUserFriendDao.batchInsert(teachers,teacherId);
+		if(teachers.size() > 0){
+			//删除现有的用户通讯录
+			imUserFriendDao.deleteByUserId(teacherId);
+			//批量新增
+			imUserFriendDao.batchInsert(teachers,teacherId);
+		}
 	}
 
     @Override

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

@@ -110,11 +110,9 @@
 
 
     <!-- 向数据库增加一条记录 -->
-    <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.StudentRegistration" useGeneratedKeys="true"
-            keyColumn="id" keyProperty="id">
+    <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.StudentRegistration" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
         INSERT INTO student_registration
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id!=null">id_,</if>
             <if test="userId!=null">user_id_,</if>
             <if test="name!=null">name_,</if>
             <if test="musicGroupId!=null">music_group_id_,</if>
@@ -139,7 +137,6 @@
         </trim>
         VALUES
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id!=null">#{id},</if>
             <if test="userId!=null">#{userId},</if>
             <if test="name!=null">#{name},</if>
             <if test="musicGroupId!=null">#{musicGroupId},</if>
@@ -164,7 +161,7 @@
                 #{musicGroupStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
             <if test="temporaryCourseFee != null">#{temporaryCourseFee},</if>
-            <if test="surplusCourseFee != null">#{surplus_course_fee_},</if>
+            <if test="surplusCourseFee != null">#{surplusCourseFee},</if>
             <if test="createTime!=null">#{createTime},</if>
             <if test="updateTime!=null">NOW(),</if>
         </trim>