Merge branch 'saas' into test

cms/src/main/java/com/ym/mec/cms/service/impl/SysNewsInformationServiceImpl.java

@@ -84,13 +84,13 @@ public class SysNewsInformationServiceImpl extends BaseServiceImpl<Long, SysNews
 		queryInfo.setMemo(memo);
 		queryInfo.setType(6);
 		queryInfo.setTenantId(-1);
-		// App按钮查询时重置默认查询条件rows=999
-		queryInfo.setRows(999);
 		MapUtil.populateMap(params, queryInfo);
 		count = sysNewsInformationDao.queryHomeCount(params);
 		if(count == 0){
 			queryInfo.setMemo(null);
 		}
+		// App按钮查询时重置默认查询条件rows=100
+		queryInfo.setRows(100);
 		PageInfo<SysNewsInformation> app = queryHomePage(queryInfo);
 		if(!CollectionUtils.isEmpty(app.getRows()) && user != null && user.getId() != null){
 			

mec-application/src/main/java/com/ym/mec/student/controller/StudentManageController.java

@@ -20,6 +20,7 @@ import com.ym.mec.util.date.DateUtil;
 import com.ym.mec.util.http.HttpUtil;
 import com.ym.mec.util.upload.UploadUtil;
 import io.swagger.annotations.*;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

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

@@ -39,6 +39,7 @@
 		<result column="track_" property="track" />
 		<result column="ext_config_json_" property="extConfigJson" />
 		<result column="ext_style_config_json_" property="extStyleConfigJson" />
+		<result column="rank_ids_" property="rankIds" />
 	</resultMap>
 
 	<delete id="deleteBySongId">
@@ -182,7 +183,7 @@
 	</select>
 	<select id="queryAccPage" resultMap="SysMusicScoreAccompaniment">
 		SELECT sesa.*,ses.name_,ses.type_,ses.url_,s.name_ subject_name_,sesc.name_ categories_name_,sesc.id_ categories_id_,sesc.parent_id_ parent_categories_id_,ses.client_type_,
-		ses.enable_evaluation_,ses.metronome_url_,ses.midi_url_,ses.play_mode_,ses.render_from_,ses.ext_config_json_,ses.ext_style_config_json_
+		ses.enable_evaluation_,ses.metronome_url_,ses.midi_url_,ses.play_mode_,ses.render_from_,ses.ext_config_json_,ses.ext_style_config_json_,ses.rank_ids_
 		FROM sys_music_score ses
 		LEFT JOIN sys_music_score_accompaniment sesa ON ses.id_ = sesa.exam_song_id_
 		LEFT JOIN sys_music_score_categories sesc ON sesc.id_ = ses.music_score_categories_id_