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

Lyh server



查看合并请求 !3262

@@ -366,7 +366,7 @@ class TranslateController extends BaseController
                             $count = 0;
                             $count = 0;
                         } else {
                         } else {
                             $cateRelateModel = new CategoryRelated();
                             $cateRelateModel = new CategoryRelated();
-                            $count = $cateRelateModel->whereIn('id', $ids)->distinct(true)->count();
+                            $count = $cateRelateModel->whereIn('cateid', $ids)->distinct('product_id')->count();
                         }
                         }
                     }
                     }
                     $this->pageSixList($data,$count,$v,1,15);
                     $this->pageSixList($data,$count,$v,1,15);

@@ -76,12 +76,16 @@ class GeoLinkLogic extends BaseLogic
             if(!empty($this->param['data'])){
             if(!empty($this->param['data'])){
                 $data = [];
                 $data = [];
                 foreach ($this->param['data'] as $item){
                 foreach ($this->param['data'] as $item){
-                    $data[] = [
-                        'project_id'=>$this->param['project_id'],
-                        'da'=>$item['da'] ?? 0,
-                        'url'=>$item['url'],
-                        'send_time'=>$item['send_time']
-                    ];
+                    //查看当前Url是否存在
+                    $info = $this->model->read(['url'=>$item['url'],'type'=>$this->model::TYPE_NEWS,'project_id'=>$this->param['project_id']]);
+                    if($info === false){
+                        $data[] = [
+                            'project_id'=>$this->param['project_id'],
+                            'da'=>$item['da'] ?? 0,
+                            'url'=>$item['url'],
+                            'send_time'=>$item['send_time']
+                        ];
+                    }
                 }
                 }
                 $this->model->insertAll($data);
                 $this->model->insertAll($data);
             }
             }

@@ -44,6 +44,7 @@ class LinkDataLogic extends BaseLogic
     public function batchSave(){
     public function batchSave(){
         $data = [];
         $data = [];
         foreach ($this->param['data'] as $v){
         foreach ($this->param['data'] as $v){
+            //todo::数据去重
             $data[] = [
             $data[] = [
                 'url'=>$v['url'],
                 'url'=>$v['url'],
                 'da'=>$v['da_values'],
                 'da'=>$v['da_values'],