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

变更数据



查看合并请求 !3159

@@ -82,11 +82,11 @@ class GeoConfirmController extends BaseController
     public function saveInfo()
     {
         $this->request->validate([
-            'id' => 'required',
+            'project_id'=>'required',
             'confirm' => 'required',
             'confirm_num' => 'required',
         ], [
-            'id.required' => '主键id不能为空',
+            'project_id.required' => '主键id不能为空',
             'confirm.required' => '客户确认内容不能为空',
             'confirm_num.max' => '客户确认数量不能为空',
         ]);

@@ -28,6 +28,7 @@ class LinkDataController extends BaseController
         if(!isset($this->map['type']) || empty($this->map['type'])){
             $this->map['type'] = $linkData::TYPE_LINK;
         }
+        $this->map['project_id'] = $this->user['project_id'];
         $lists = $linkData->lists($this->map,$this->page,$this->row);
         $this->response('success',Code::SUCCESS,$lists);
     }

@@ -84,7 +84,13 @@ class GeoConfirmLogic extends BaseLogic
     public function saveConfirmInfo()
     {
         $this->param['status'] = GeoConfirm::STATUS_FINISH;
-        $this->model->edit($this->param,['id'=>$this->param['id']]);
-        return $this->success(['id'=>$this->param['id']]);
+        $info = $this->model->read(['project_id' => $this->param['project_id']]);
+        if($info === false){
+            $id = $this->model->addReturnId($this->param);
+        }else{
+            $id  = $info['id'];
+            $this->model->edit($this->param,['id'=>$info['id']]);
+        }
+        return $this->success(['id'=>$id]);
     }
 }

@@ -16,6 +16,7 @@ use App\Models\Product\Product;
 use App\Models\Project\Project;
 use App\Models\RankData\RankData as RankDataModel;
 use App\Models\Service\Service;
+use App\Services\ProjectServer;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
@@ -90,6 +91,7 @@ class CountLogic extends BaseLogic
      * @time   :2023/5/24 13:33
      */
     public function total_count($inquiry_num = ''){
+        ProjectServer::useProject($this->user['project_id']);
         $pv = (new VisitItem())->count();
         $ip = (new Visit())->count();
         $data = [