From b41a6efe17ba61d150c5a9b7309651cebae54e0d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 03 九月 2021 16:40:43 +0800
Subject: [PATCH] 韩迷TV相关bug修改，电视直播完善（后台+前端API）
---
src/main/java/com/yeshi/buwan/dao/live/TVLiveCategoryDao.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/yeshi/buwan/dao/live/TVLiveCategoryDao.java b/src/main/java/com/yeshi/buwan/dao/live/TVLiveCategoryDao.java
index 672a2a9..6867df4 100644
--- a/src/main/java/com/yeshi/buwan/dao/live/TVLiveCategoryDao.java
+++ b/src/main/java/com/yeshi/buwan/dao/live/TVLiveCategoryDao.java
@@ -42,9 +42,11 @@
if (daoQuery.name != null) {
andList.add(Criteria.where("name").regex(daoQuery.name));
}
- Criteria[] ands = new Criteria[andList.size()];
- andList.toArray(ands);
- query.addCriteria(new Criteria().andOperator(ands));
+ if(andList.size()>0) {
+ Criteria[] ands = new Criteria[andList.size()];
+ andList.toArray(ands);
+ query.addCriteria(new Criteria().andOperator(ands));
+ }
return query;
}
@@ -55,7 +57,7 @@
public long count(DaoQuery daoQuery) {
- return count(daoQuery);
+ return count(getQuery(daoQuery));
}
@@ -73,6 +75,7 @@
public static class DaoQuery extends BaseQuery {
public String name;
+ public String systemId;
public List<Sort.Order> sortList;
}
}
--
Gitblit v1.8.0