去掉曲目分类

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

@@ -221,12 +221,14 @@ public class LessonCoursewareServiceImpl extends ServiceImpl<LessonCoursewareMap
             for (CbsLessonCoursewareDetailWrapper.MaterialSmall materialSmall : materialList) {
                 if(materialSmall.getType() == EMaterialType.SONG){
                     SysMusicScore musicScore = sysMusicScoreService.getDao().getCbsId(Long.parseLong(materialSmall.getContent()));
-                    if(musicScore != null && musicScore.getShowFlag() == 1) {
+                    //没有启用的曲目不显示
+                    if(musicScore != null && musicScore.getShowFlag() == 1 && musicScore.getClientShowFlag() == 1) {
                         materialSmall.setContent(musicScore.getId().toString());
                     }else {
                         materialSmall.setContent(null);
                     }
                 }
+                //
                 List<CbsMaterialRefWrapper.AddMaterialRef> materialRefs = materialSmall.getMaterialRefs();
                 if (CollectionUtils.isNotEmpty(materialRefs)){
                     for (CbsMaterialRefWrapper.AddMaterialRef materialRef : materialRefs) {
@@ -234,7 +236,7 @@ public class LessonCoursewareServiceImpl extends ServiceImpl<LessonCoursewareMap
                         if(relateMaterialInfo != null && StringUtils.equals(relateMaterialInfo.getType(),"SONG")
                                 && CollectionUtils.isNotEmpty(relateMaterialInfo.getApplicationIdList())){
                             SysMusicScore musicScore = sysMusicScoreService.getDao().getCbsId(relateMaterialInfo.getId());
-                            if(musicScore != null && musicScore.getShowFlag() == 1) {
+                            if(musicScore != null && musicScore.getShowFlag() == 1 && musicScore.getClientShowFlag() == 1) {
                                 materialRef.setResourceIdStr(musicScore.getId().toString());
                             }
                         }

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

@@ -113,7 +113,7 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 			Integer tenantId = TenantContextHolder.getTenantId();
 			TenantInfo tenantInfo = tenantInfoService.get(tenantId);
 			//如果是超管，或者是机构管理员，可以查看当前机构所有分部数据
-			if(isSuper || (tenantInfo.getUserId() != null && tenantInfo.getUserId().equals(userId))){
+			if(isSuper || (tenantInfo != null && tenantInfo.getUserId() != null && tenantInfo.getUserId().equals(userId))){
 				Map<String,Object> param = new HashMap<>();
 				param.put("tenantId",tenantId);
 				List<Organization> all = this.findAll(param);