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/service/manager/SolrAlbumVideoDataManager.java |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/yeshi/buwan/service/manager/SolrAlbumVideoDataManager.java b/src/main/java/com/yeshi/buwan/service/manager/SolrAlbumVideoDataManager.java
index 2ba98e9..d47e0b1 100644
--- a/src/main/java/com/yeshi/buwan/service/manager/SolrAlbumVideoDataManager.java
+++ b/src/main/java/com/yeshi/buwan/service/manager/SolrAlbumVideoDataManager.java
@@ -152,7 +152,7 @@
         if (filter.getResourceIds() != null && filter.getResourceIds().length > 0) {
             query.addFilterQuery(new SimpleFilterQuery(Criteria.where("resourceIds").contains(filter.getResourceIds())));
         }
-        if(filter.getFreeType()!=null){
+        if (filter.getFreeType() != null) {
             query.addFilterQuery(new SimpleFilterQuery(Criteria.where("free_type").is(filter.getFreeType())));
         }
 
@@ -161,9 +161,7 @@
         query.setOffset((page - 1) * pageSize);
         /** 璁剧疆姣忛〉鏄剧ず璁板綍鏁帮紝榛樿10 */
         query.setRows(pageSize);
-        if (StringUtil.isNullOrEmpty(filter.getSortKey())) {
-            query.addSort(new Sort(Sort.Direction.DESC, "year"));
-        } else {
+        if (!StringUtil.isNullOrEmpty(filter.getSortKey())) {
             query.addSort(new Sort(Sort.Direction.DESC, filter.getSortKey()));
         }
 
@@ -224,7 +222,7 @@
                 }
                 saveOrUpdate(videoList);
             } catch (Exception e) {
-                logger.error("涓撹緫鎼滅储寮曟搸鏁版嵁鍚屾澶辫触",e);
+                logger.error("涓撹緫鎼滅储寮曟搸鏁版嵁鍚屾澶辫触", e);
             }
         }
     }

--
Gitblit v1.8.0