fix

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

@@ -344,10 +344,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");
                 }
@@ -496,10 +496,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");
                 }