From b37275dba6b782bf3bb3817c4504f6cdef1bef7c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 18 三月 2021 18:38:51 +0800
Subject: [PATCH] APP首页顶部标签兼容

---
 src/main/java/com/yeshi/buwan/dao/recommend/SuperHomeRecommendSpecialDao.java |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/yeshi/buwan/dao/recommend/SuperHomeRecommendSpecialDao.java b/src/main/java/com/yeshi/buwan/dao/recommend/SuperHomeRecommendSpecialDao.java
index 35065b2..fd2ef12 100644
--- a/src/main/java/com/yeshi/buwan/dao/recommend/SuperHomeRecommendSpecialDao.java
+++ b/src/main/java/com/yeshi/buwan/dao/recommend/SuperHomeRecommendSpecialDao.java
@@ -16,7 +16,7 @@
 public class SuperHomeRecommendSpecialDao extends MongodbBaseDao<SuperHomeRecommendSpecial> {
 
 
-    public List<SuperHomeRecommendSpecial> list(SuperHomeRecommendSpecialDao.DaoQuery daoQuery) {
+    private Query getQuery(SuperHomeRecommendSpecialDao.DaoQuery daoQuery) {
         Query query = new Query();
         List<Criteria> andList = new ArrayList<>();
 
@@ -26,6 +26,10 @@
 
         if (daoQuery.detailSystemId != null) {
             andList.add(Criteria.where("detailSystemId").is(daoQuery.detailSystemId));
+        }
+
+        if (daoQuery.showName != null) {
+            andList.add(Criteria.where("showName").regex(daoQuery.showName));
         }
 
 
@@ -38,11 +42,23 @@
 
         query.addCriteria(criteria);
 
+        return query;
+
+    }
+
+    public List<SuperHomeRecommendSpecial> list(SuperHomeRecommendSpecialDao.DaoQuery daoQuery) {
+        Query query = getQuery(daoQuery);
         query.skip(daoQuery.start);
         query.limit(daoQuery.count);
         query.with(new Sort(new Sort.Order(Sort.Direction.DESC, "weight")));
 
         return findList(query);
+    }
+
+
+    public long count(SuperHomeRecommendSpecialDao.DaoQuery daoQuery) {
+        Query query = getQuery(daoQuery);
+        return count(query);
     }
 
     public void updateSelective(SuperHomeRecommendSpecial bean) {
@@ -71,6 +87,7 @@
     public static class DaoQuery {
         public String specialId;
         public String detailSystemId;
+        public String showName;
         public int start;
         public int count;
     }

--
Gitblit v1.8.0