合并分支 'lyh-server' 到 'master'

列表页聚合页模式



查看合并请求 !2476

@@ -50,7 +50,7 @@ class AuthorityScoreLogic extends BaseLogic
         $endTime = date('Y-m-t 23:59:59', strtotime($this->param['date']));
         $endTime = date('Y-m-t 23:59:59', strtotime($this->param['date']));
         //当月ai_blog发布数量及链接
         //当月ai_blog发布数量及链接
         $aiBlogModel = new AiBlog();
         $aiBlogModel = new AiBlog();
-        $data['ai_blog']['count'] = $aiBlogModel->counts(['created_at'=>['between',[$startTime,$endTime]]]);
+        $data['ai_blog']['count'] = $aiBlogModel->counts(['created_at'=>['between',[$startTime,$endTime]],'route'=>['!=',null]]);
         $aiRouteArr = $aiBlogModel->selectField(['created_at'=>['between',[$startTime,$endTime]],'route'=>['!=',null]],'route');
         $aiRouteArr = $aiBlogModel->selectField(['created_at'=>['between',[$startTime,$endTime]],'route'=>['!=',null]],'route');
         if(!empty($aiRouteArr)){
         if(!empty($aiRouteArr)){
             foreach ($aiRouteArr as $k => $item){
             foreach ($aiRouteArr as $k => $item){
@@ -60,7 +60,7 @@ class AuthorityScoreLogic extends BaseLogic
         $data['ai_blog']['link'] = $aiRouteArr;
         $data['ai_blog']['link'] = $aiRouteArr;
         //当月ai_video发布数量及链接
         //当月ai_video发布数量及链接
         $aiVideoModel = new AiVideo();
         $aiVideoModel = new AiVideo();
-        $data['ai_video']['count'] =$aiVideoModel->counts(['created_at'=>['between',[$startTime,$endTime]]]);
+        $data['ai_video']['count'] =$aiVideoModel->counts(['created_at'=>['between',[$startTime,$endTime]],'route'=>['!=',null]]);
         $aiVideoRouteArr = $aiVideoModel->selectField(['created_at'=>['between',[$startTime,$endTime]],'route'=>['!=',null]],'route');
         $aiVideoRouteArr = $aiVideoModel->selectField(['created_at'=>['between',[$startTime,$endTime]],'route'=>['!=',null]],'route');
         if(!empty($aiVideoRouteArr)){
         if(!empty($aiVideoRouteArr)){
             foreach ($aiVideoRouteArr as $kVideo => $itemVideo){
             foreach ($aiVideoRouteArr as $kVideo => $itemVideo){

@@ -24,7 +24,6 @@ class ProjectIndustryRelated extends Base
         }
         }
         //先删除
         //先删除
         self::where('project_id', $project_id)->delete();
         self::where('project_id', $project_id)->delete();
-
         //批量保存
         //批量保存
         if (!empty($industry_ids)) {
         if (!empty($industry_ids)) {
             $data = [];
             $data = [];