Merge remote-tracking branch 'origin/master'

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

@@ -493,6 +493,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 sysUser.setUserType(SysUserType.STUDENT);
                 sysUser.setIdCardNo(studentRegistration.getIdCardNo());
                 sysUser.setOrganId(studentRegistration.getOrganId());
+                sysUser.setBirthdate(studentRegistration.getBirthdate());
                 teacherDao.addSysUser(sysUser);
                 userId = sysUser.getId();
                 //添加用户现金账户
@@ -512,6 +513,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 sysUser.setUsername(studentRegistration.getName());
                 sysUser.setGender(studentRegistration.getGender());
                 sysUser.setOrganId(studentRegistration.getOrganId());
+                sysUser.setBirthdate(studentRegistration.getBirthdate());
                 teacherDao.updateUser(sysUser);
                 userId = sysUser.getId();
             }

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

@@ -355,10 +355,7 @@
     <sql id="queryMusicGroupStudentSql">
         <where>
             <if test="search != null and search != ''">
-                AND (su.real_name_ like CONCAT("%",#{search},"%") OR sr.parents_phone_ like CONCAT("%",#{search},"%"))
-            </if>
-            <if test="studentName != null">
-                AND su.username_ like CONCAT("%",#{studentName},"%")
+                AND (su.username_ like CONCAT("%",#{search},"%") OR sr.parents_phone_ like CONCAT("%",#{search},"%"))
             </if>
             <if test="subjectId != null">
                 AND sr.actual_subject_id_ = #{subjectId}