Merge remote-tracking branch 'origin/adapay_new' into adapay_new

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

@@ -496,7 +496,9 @@ public class StudentManageServiceImpl implements StudentManageService {
         if (sysUser1 != null && !userId.equals(sysUser1.getId())) {
             throw new BizException("手机号已被占用");
         }
-        teacherDao.updateUser(student);
+        sysUserFeignService.updateSysUser(student);
+
+        student.setUserId(student.getId());
         student.setOperatingTag(student.getOperatingTag());
         student.setOperatingTempTag(0);
         student.setServiceTag(student.getServiceTag() == 0 ? 2 : 1);

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

@@ -148,8 +148,8 @@
     </update>
 
     <select id="findStudentsByOrganId" resultMap="studentManageListDto">
-        SELECT o.`name_` organ_name_,s.`user_id_` ,su.`username_` ,su.`phone_` parents_phone_,su.`real_name_` ,su.`gender_` , 
-		tu.`username_` teacher_name_,s.`service_tag_` ,s.`operating_tag_` , suca.`course_balance_` ,sub.`name_` music_group_subject_ 
+        SELECT o.`name_` organ_name_,s.`user_id_` ,su.`username_` ,su.`phone_` parents_phone_,su.`real_name_` ,su.`gender_` , su.organ_id_,
+		tu.`username_` teacher_name_,s.`service_tag_` ,s.`operating_tag_` , suca.`course_balance_` ,sub.`name_` music_group_subject_ ,su.birthdate_,s.subject_id_list_,s.teacher_id_
 		FROM `student` s LEFT JOIN `sys_user` su on s.`user_id_` = su.`id_`
 		LEFT JOIN `organization` o on o.`id_` = su.`organ_id_`
 		LEFT JOIN `sys_user` tu on tu.`id_` = s.`teacher_id_` 
@@ -790,7 +790,7 @@
     </select>
     
     <select id="queryStudentRemianCourse" resultMap="StudentListCourseDto">
-    	SELECT cssp.`user_id_` ,count(cssp.`id_`) remainCourseNum,sum(case when cs.`group_type_` = 'PRACTICE' then 1 else 0 end) remainPracticeNum  
+    	SELECT cssp.`user_id_` userId,count(cssp.`id_`) remainCourseNum,sum(case when cs.`group_type_` = 'PRACTICE' then 1 else 0 end) remainPracticeNum  
     	FROM `course_schedule_student_payment` cssp LEFT JOIN `course_schedule` cs on cssp.`course_schedule_id_` = cs.`id_`
 		WHERE cs.`status_` = 'NOT_START' AND cssp.`user_id_` IN
         <foreach collection="userIds" item="userId" open="(" close=")" separator=",">