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

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

@@ -204,15 +204,10 @@ public class StudentManageServiceImpl implements StudentManageService {
             }
 
             if(userContractVersionMap.containsKey(dto.getUserId())){
-//                dto.setContractVersions(StringUtils.join(userContractVersionMap.get(dto.getUserId()), ","));
                 dto.setIsSignedContract(true);
             }else{
                 dto.setIsSignedContract(false);
             }
-//            for (Subject subject : studentSubject) {
-//                if(!subject.getId().equals(dto.getUserId())) continue;
-//                dto.setSubjectName(subject.getName());
-//            }
             //年级
             dto.setCurrentGrade(studentService.getStudentGrade(dto.getGradeType(),dto.getCurrentGradeNum()));
         }

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

@@ -246,9 +246,6 @@
                 #{userId}
             </foreach>
         </if>
-        <if test="isMusicMember = 'true'">
-            AND music_group_id_ IS NOT NULL
-        </if>
         GROUP BY student_id_
     </select>
     <resultMap id="CloudTeacherActiveTargetDetailDto" type="com.ym.mec.biz.dal.dto.CloudTeacherActiveTargetDetailDto">