Merge branch 'feature/0721-tenant' of http://git.dayaedu.com/yonge/cooleshow into develop

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/StudentServiceImpl.java

@@ -506,6 +506,7 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
             student.setName(studentImport.getUserName());
             student.setGender("男".equals(studentImport.getGender()) ? 1 : 0);
             student.setSubjectId(subjectIdNamemap.get(studentImport.getSubjectName()).toString());
+            student.setPhone(studentImport.getPhone());
 
             LocalDate birthday = LocalDate.parse(studentImport.getBirthday(), DateTimeFormatter.ISO_LOCAL_DATE);
             student.setBirthdate(birthday);

cooleshow-user/user-biz/src/main/resources/config/mybatis/SysMusicCompareRecordMapper.xml

@@ -369,7 +369,7 @@
 		group by smcr.user_id_, DATE_FORMAT(create_time_, '%Y-%m-%d')) mprs ON mprs.user_id_ = st.user_id_
 		left join sys_user su ON st.user_id_ = su.id_
 		left join subject sb ON sb.id_ = st.subject_id_
-		where st.membership_end_time_ >= NOW()
+		where st.membership_end_time_ >= NOW() AND mprs.user_id_ = st.user_id_
 		<if test="search != null and search != ''">
 			AND su.username_ LIKE CONCAT('%',#{keyword},'%')
 		</if>