Merge branch 'zx_saas_cbs_category' of http://git.dayaedu.com/yonge/mec into test

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

@@ -52,7 +52,7 @@ public class SysMusicScoreCategoriesController extends BaseController {
         SysUser sysUser = sysUserService.getUser();
         String teachingMaterialIds = organizationService.getTeachingMaterialIds(sysUser.getOrganId().toString(),sysUser.getTenantId());
         if(teachingMaterialIds.contains(queryInfo.getParentId().toString())){
-            return succeed(cbsMusicScoreCategoriesService.queryTreeByAppId());
+            return succeed(cbsMusicScoreCategoriesService.queryTree(queryInfo));
         }
         return succeed();
     }

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

@@ -9,6 +9,7 @@ import com.ym.mec.biz.dal.entity.SysMusicScoreCategories;
 import com.ym.mec.biz.service.CbsMusicScoreCategoriesService;
 import com.ym.mec.common.exception.BizException;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -66,6 +67,9 @@ public class CbsMusicScoreCategoriesServiceImpl implements CbsMusicScoreCategori
 
 	@Override
 	public List<SysMusicScoreCategories> queryByIds(String ids) {
+		if (StringUtils.isEmpty(ids)) {
+			return new ArrayList<>();
+		}
 		R<List<MusicSheetCategoriesWrapper.MusicSheetCategories>> listR = musicFeignClientService.findByIds(ids);
 		if (listR.getCode() != 200) {
 			throw new BizException("查询曲目分类失败,{}", listR.getMessage());

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

@@ -196,7 +196,8 @@
 				play_mode_ = #{item.musicSheetUpdate.playMode},
 				music_sheet_type_ = #{item.musicSheetUpdate.musicSheetType},
 				is_all_subject_ = #{item.musicSheetUpdate.isAllSubject},
-				cbs_music_categories_id_ = #{item.musicSheetUpdate.musicCategoryId}
+				cbs_music_categories_id_ = #{item.musicSheetUpdate.musicCategoryId},
+				client_show_flag_ = #{item.musicSheetUpdate.platformStatus}
 			</if>
 			where cbs_music_sheet_id_ = #{item.musicSheetId}
 		</foreach>