Merge branch 'dev-xym-update-match-video' of Server/long-article-manage into master

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/impl/CoreServiceImpl.java

@@ -668,14 +668,11 @@ public class CoreServiceImpl implements CoreService {
         }
         //获取待排序数据  数量不足会返回空list
         List<PublishArticleData> rankList = contentService.getWaitingSort(planAccount);
-        if (CollectionUtils.isEmpty(rankList)) {
-            return;
-        }
         if (StringUtils.isNotEmpty(planAccount.getSortStrategy())) {
             rankList = contentService.getSortList(planAccount);
-            if (CollectionUtils.isEmpty(rankList)) {
-                return;
-            }
+        }
+        if (CollectionUtils.isEmpty(rankList)) {
+            return;
         }
         //文章处理  小程序查询和发布
         List<PushContentParam> pushContentList = new ArrayList<>();