酷乐秀曲目来源改为内容平台

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/MusicSheetApplicationExtendController.java

@@ -91,7 +91,7 @@ public class MusicSheetApplicationExtendController {
 
     @PreAuthorize("@pcs.hasPermissions('musicSheetApplicationExtend/page')")
     @PostMapping({"/page"})
-    public R<PageInfo<CbsMusicSheetWrapper.MusicSheet>> musicSheetPage(@RequestBody CbsMusicSheetWrapper.MusicSheetQuery var1) {
+    public R<PageInfo> musicSheetPage(@RequestBody CbsMusicSheetWrapper.MusicSheetQuery var1) {
         var1.setAddAppId(Long.parseLong(openFeignClientConfigProperties.getAppId()));
         try {
             PageInfo<CbsMusicSheetWrapper.MusicSheet> info = this.musicFeignClientService.musicSheetPage(var1).feignData();

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/SubjectServiceImpl.java

@@ -326,7 +326,7 @@ public class SubjectServiceImpl extends BaseServiceImpl<Long, Subject> implement
                 CbsSubjectWrapper.SubjectQuery subjectQuery = new CbsSubjectWrapper.SubjectQuery();
                 subjectQuery.setIds(cbsSubjectIds);
                 subjectQuery.setName(query.getKeyword());
-                subjectQuery.setPage(query.getPage());
+                subjectQuery.setPage(1);
                 subjectQuery.setRows(query.getRows());
                 try {
                     com.microsvc.toolkit.common.response.paging.PageInfo<CbsSubjectWrapper.Subject> subjectPageInfo = musicFeignClientService.subjectPage(subjectQuery).feignData();

cooleshow-user/user-biz/src/main/resources/config/mybatis/SubjectMapper.xml

@@ -241,12 +241,11 @@
         FROM subject t
         LEFT JOIN instrument i on t.id_ = i.subject_id_
         <where>
-            AND t.cbs_subject_id_ is not null
             <if test="parentSubjectId != null">
                 AND t.parent_subject_id_ = #{parentSubjectId}
             </if>
             <if test="parentSubjectId == null">
-                AND t.parent_subject_id_ != 0
+                AND t.parent_subject_id_ != 0 AND t.cbs_subject_id_ is not null
             </if>
             <if test="delFlag != null">
                 AND t.del_flag_ = #{delFlag}
@@ -296,12 +295,11 @@
         FROM subject t
         LEFT JOIN instrument i on t.id_ = i.subject_id_
         <where>
-            AND t.cbs_subject_id_ is not null
             <if test="parentSubjectId != null">
                 AND t.parent_subject_id_ = #{parentSubjectId}
             </if>
             <if test="parentSubjectId == null">
-                AND t.parent_subject_id_ != 0
+                AND t.parent_subject_id_ != 0 AND t.cbs_subject_id_ is not null
             </if>
             <if test="delFlag != null">
                 AND t.del_flag_ = #{delFlag}