liujc 7 months ago
parent
commit
bf2296f154

+ 2 - 2
cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/TenantAlbumController.java

@@ -178,8 +178,8 @@ public class TenantAlbumController {
                 }
                 if (o.getId().equals(categoryId) && StringUtils.isNotBlank(s)) {
                     tenantAlbumSheet.setErrFlag(false);
-                    tenantAlbumSheet.setLoop(false);
-                    return s;
+//                    tenantAlbumSheet.setLoop(false);
+//                    return s;
                 }
                 if (StringUtils.isNotBlank(s)) {
                     return o.getName() + "/" + s;

+ 1 - 1
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/MusicSheetServiceImpl.java

@@ -687,7 +687,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
                     }
                 }
             }
-            detail.setNotation(detail.getTenantNotation()?YesOrNoEnum.YES:YesOrNoEnum.NO);
+            detail.setNotation(detail.getTenantNotation() !=null&& detail.getTenantNotation()?YesOrNoEnum.YES:YesOrNoEnum.NO);
             detail.setScoreType(detail.getTenantScoreType());
         }
         return detail;