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

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

@@ -91,13 +91,11 @@ public class MusicSheetApplicationExtendController {
 
     @PreAuthorize("@pcs.hasPermissions('musicSheetApplicationExtend/page')")
     @PostMapping({"/page"})
-    public R<PageInfo> musicSheetPage(@RequestBody CbsMusicSheetWrapper.MusicSheetQuery var1) {
+    public R<PageInfo<CbsMusicSheetWrapper.MusicSheet>> musicSheetPage(@RequestBody CbsMusicSheetWrapper.MusicSheetQuery var1) {
         var1.setAddAppId(Long.parseLong(openFeignClientConfigProperties.getAppId()));
         try {
             PageInfo<CbsMusicSheetWrapper.MusicSheet> info = this.musicFeignClientService.musicSheetPage(var1).feignData();
-            if (CollectionUtils.isEmpty(info.getRows())) {
-                return R.from(info);
-            }else {
+            if (CollectionUtils.isNotEmpty(info.getRows())) {
                 List<MusicSheetWrapper.CbsMusicSheet> result = new ArrayList<>();
                 for (CbsMusicSheetWrapper.MusicSheet row : info.getRows()) {
                     MusicSheetWrapper.CbsMusicSheet cbsMusicSheet = JSONObject.parseObject(JSONObject.toJSONString(row), MusicSheetWrapper.CbsMusicSheet.class);
@@ -111,8 +109,8 @@ public class MusicSheetApplicationExtendController {
                     result.add(cbsMusicSheet);
                 }
                 PageUtil.pageInfo(info, result);
-                return R.from(info);
             }
+            return R.from(info);
         } catch (Exception e) {
             log.error("查询曲目应用拓展表异常", e);
             if (e instanceof BizException) {

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

@@ -317,7 +317,7 @@ public class SubjectServiceImpl extends BaseServiceImpl<Long, Subject> implement
             pageInfo.setTotal(count);
             params.put("offset", pageInfo.getOffset());
             dataList = subjectDao.findPage(params);
-            if(query.getParentSubjectId() == null){
+            if(query.getParentSubjectId() == null || query.getParentSubjectId() > 0){
                 // 转map
                 Map<Long, SubjectWrapper.Subject> subjectMap = dataList.stream().collect(Collectors.toMap(SubjectWrapper.Subject::getCbsSubjectId, Function.identity(),(o1, o2)->o1));
                 // cbs声部ID集合

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

@@ -301,6 +301,9 @@
             <if test="parentSubjectId == null">
                 AND t.parent_subject_id_ != 0 AND t.cbs_subject_id_ is not null
             </if>
+            <if test="keyword != null and keyword != ''">
+                AND t.name_ LIKE CONCAT('%',#{keyword},'%')
+            </if>
             <if test="delFlag != null">
                 AND t.del_flag_ = #{delFlag}
             </if>