Merge branch 'feature/1022_vip' into dev

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

@@ -335,12 +335,13 @@ public class StudentLessonTrainingDetailServiceImpl extends ServiceImpl<StudentL
             }
             if ("VIDEO".equals(studentLessonTrainingDetail.getHomeworkType()) && StringUtils.isNotBlank(studentLessonTrainingDetail.getLessonCoursewareId())) {
                 List<Integer> courseTypeIds = userVipMap.get(studentLessonTrainingDetail.getUserId().intValue());
-                if (CollectionUtils.isNotEmpty(courseTypeIds)) {
-                    if (courseTypeIds.contains(Integer.parseInt(studentLessonTrainingDetail.getLessonCoursewareId()))) {
-                        studentLessonTrainingDetail.setUseStatus("UNLOCK");
-                    } else {
-                        studentLessonTrainingDetail.setUseStatus("LOCK");
-                    }
+                if (CollectionUtils.isEmpty(courseTypeIds)) {
+                    courseTypeIds = new ArrayList<>();
+                }
+                if (courseTypeIds.contains(Integer.parseInt(studentLessonTrainingDetail.getLessonCoursewareId()))) {
+                    studentLessonTrainingDetail.setUseStatus("UNLOCK");
+                } else {
+                    studentLessonTrainingDetail.setUseStatus("LOCK");
                 }
             } else if ("VIDEO".equals(studentLessonTrainingDetail.getHomeworkType())){
                 studentLessonTrainingDetail.setUseStatus("UNLOCK");

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

@@ -351,10 +351,10 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
 
             // 判断曲目是否在分类中
             for (SysMusicScore row : rows) {
-                if (categoryIds.contains(row.getCbsMusicCategoriesId())) {
-                    row.setUseStatus("UNLOCK");
-                } else if (StringUtils.isBlank(row.getRankIds())) {
+                if (StringUtils.isBlank(row.getRankIds())) {
                     row.setUseStatus("FREE");
+                } else if (categoryIds.contains(row.getCbsMusicCategoriesId())) {
+                    row.setUseStatus("UNLOCK");
                 } else {
                     row.setUseStatus("LOCK");
                 }
@@ -503,10 +503,10 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
             List<Integer> categoryIds = categoryMapperList.stream().map(MemberRankCategoryMapper::getCategoryId).distinct().collect(Collectors.toList());
 
             // 判断曲目是否在分类中
-                if (categoryIds.contains(sysMusicScore.getCbsMusicCategoriesId())) {
-                    clientMusicSheetInfo.setUseStatus("UNLOCK");
-                } else if (StringUtils.isBlank(sysMusicScore.getRankIds())) {
+                if (StringUtils.isBlank(sysMusicScore.getRankIds())) {
                     clientMusicSheetInfo.setUseStatus("FREE");
+                } else if (categoryIds.contains(sysMusicScore.getCbsMusicCategoriesId())) {
+                    clientMusicSheetInfo.setUseStatus("UNLOCK");
                 } else {
                     clientMusicSheetInfo.setUseStatus("LOCK");
                 }