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

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

@@ -23,7 +23,7 @@ import java.util.stream.Collectors;
 
 @Service
 public class SysMusicScoreCategoriesServiceImpl extends BaseServiceImpl<Integer, SysMusicScoreCategories> implements SysMusicScoreCategoriesService {
-	
+
 	@Autowired
 	private SysMusicScoreCategoriesDao sysMusicScoreCategoriesDao;
 	@Autowired
@@ -40,7 +40,7 @@ public class SysMusicScoreCategoriesServiceImpl extends BaseServiceImpl<Integer,
 		List<SysMusicScoreCategories> scoreCategories = sysMusicScoreCategoriesDao.findByParentId(menuQueryInfo.getParentId(),menuQueryInfo.getOrganId(),menuQueryInfo.getEnable());
 		List<SysMusicScoreCategories> scoreCategoriesAllList = sysMusicScoreCategoriesDao.findByParentId(null,menuQueryInfo.getOrganId(),menuQueryInfo.getEnable());
 		for (SysMusicScoreCategories categories : scoreCategories) {
-			categories = getTree(categories,scoreCategoriesAllList);
+			getTree(categories, scoreCategoriesAllList);
 			if (categories.getSysMusicScoreCategoriesList() != null) {
 				categories.setMusicScoreNum(categories.getSysMusicScoreCategoriesList().size());
 			} else {

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

@@ -374,10 +374,8 @@
         LEFT JOIN SUBJECT sj ON s.subject_id_list_ = sj.id_
         LEFT JOIN student_registration sr ON cto.student_id_ = sr.user_id_
         <where>
-            cto.status_ = 2 AND tor.order_no_ is not null AND tor.order_type_ = 'CLOUD_TEACHER'
-            <if test="musicGroupId != null and musicGroupId != ''">
-                AND sr.music_group_id_ = #{musicGroupId}
-            </if>
+            cto.status_ = 2 AND tor.order_no_ is not null AND tor.trans_no_ is not null
+            AND tor.order_type_ = 'CLOUD_TEACHER'
             <if test="queryCondition != null and queryCondition != ''">
                 AND (u.username_ LIKE CONCAT('%', #{queryCondition}, '%') or u.phone_ = #{queryCondition} or u.id_ = #{queryCondition})
             </if>
@@ -419,10 +417,8 @@
         LEFT JOIN subject sj ON s.subject_id_list_ = sj.id_
         LEFT JOIN student_registration sr ON cto.student_id_ = sr.user_id_
         <where>
-            cto.status_ = 2 AND tor.order_no_ is not null AND tor.order_type_ = 'CLOUD_TEACHER'
-            <if test="musicGroupId != null and musicGroupId != ''">
-                AND sr.music_group_id_ = #{musicGroupId}
-            </if>
+            cto.status_ = 2 AND tor.order_no_ is not null AND tor.trans_no_ is not null
+            AND tor.order_type_ = 'CLOUD_TEACHER'
             <if test="queryCondition != null and queryCondition != ''">
                 AND (u.username_ LIKE CONCAT('%', #{queryCondition}, '%') or u.phone_ = #{queryCondition} or u.id_ = #{queryCondition})
             </if>