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

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

@@ -376,7 +376,12 @@ public class SubjectServiceImpl extends BaseServiceImpl<Long, Subject> implement
         query.setRows(9999);
         Map<String, Object> params = new HashMap<>();
         MapUtil.populateMap(params, query);
-        List<SubjectWrapper.Subject> records = subjectDao.findPage(params);
+
+        PageInfo<SubjectWrapper.Subject> subjectIPage = this.selectPage(query);
+        List<SubjectWrapper.Subject> records = subjectIPage.getRows();
+        if (CollectionUtils.isEmpty(records)) {
+            return records;
+        }
         String instrumentIds = query.getInstrumentIds();
         List<Long> instrumentIdList = new ArrayList<>();
         if (StringUtils.isNotEmpty(instrumentIds)) {