刘俊驰 9 месяцев назад
Родитель
Сommit
90fed8f8aa

+ 2 - 1
mec-biz/src/main/java/com/ym/mec/biz/dal/entity/SysMusicScoreAccompaniment.java

@@ -51,7 +51,8 @@ public class SysMusicScoreAccompaniment {
 
 	/**  */
 	private Integer categoriesId;
-	
+	private Integer cbsCategoriesId;
+
 	private Integer parentCategoriesId;
 
 	/**  */

+ 7 - 4
mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysMusicScoreAccompanimentServiceImpl.java

@@ -201,6 +201,9 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Strin
 				if(musicSheetApplication.getMusicSheetCategoryId() != null){
 					record.setCategoriesId(musicSheetApplication.getMusicSheetCategoryId().intValue());
 				}
+                if (musicSheetApplication.getMusicCategoryId() != null) {
+                    record.setCbsCategoriesId(musicSheetApplication.getMusicCategoryId().intValue());
+                }
 				record.setMusicSheetType(musicSheetApplication.getMusicSheetType().getCode());
 				record.setParentCategoriesId(accompaniment.getParentCategoriesId());
 				record.setExamSongName(musicSheetApplication.getName());
@@ -376,11 +379,11 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Strin
 
 			// 判断曲目是否在分类中
 			for (SysMusicScoreAccompaniment row : accompaniments) {
-				if (categoryIds.contains(row.getCategoriesId())) {
+                if (StringUtils.isBlank(row.getRankIds())) {
+                    row.setUseStatus("FREE");
+                } else if (categoryIds.contains(row.getCbsCategoriesId())) {
 					row.setUseStatus("UNLOCK");
-				} else if (StringUtils.isBlank(row.getRankIds())) {
-					row.setUseStatus("FREE");
-				} else {
+				} else  {
 					row.setUseStatus("LOCK");
 				}
 			}