liujc пре 7 месеци
родитељ
комит
2ba55537b7

+ 1 - 1
cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/TenantMusicSheetApplicationExtendController.java

@@ -50,7 +50,7 @@ public class TenantMusicSheetApplicationExtendController {
     @PreAuthorize("@pcs.hasPermissions('tenantMusicSheetApplicationExtend/pageByApplication')")
     @PostMapping({"/pageByApplication"})
     public R<PageInfo<MusicSheetWrapper.MusicSheetApplication>> musicSheetPageByApplication(@RequestBody MusicSheetWrapper.MusicSheetApplicationQuery var1){
-        if (StringUtils.isNotBlank(var1.getSubjectType())) {
+        if (StringUtils.isNotBlank(var1.getSubjectType()) && var1.getMusicCategoryId() == null) {
             Long categoryId = null;
             if (SubjectTypeEnum.SUBJECT.name().equals(var1.getSubjectType())) {
                 categoryId= Long.parseLong(sysConfigService.findConfigValue(SysConfigConstant.TENANT_ALBUM_SUBJECT_TYPE_CATEGORY));