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

Lyh server



查看合并请求 !2435

@@ -37,6 +37,9 @@ class GeoLinkLogic extends BaseLogic
      */
     public function getLinkList($map = [],$page = 1,$row = 20,$order = 'id'){
         $filed = ['*'];
+        if(isset($map['url']) && !empty($map['url'])){
+            $map['url'] = ['like','%'.$map['url'].'%'];
+        }
         $lists = $this->model->lists($map,$page,$row,$order,$filed);
         return $this->success($lists);
     }
@@ -64,13 +67,6 @@ class GeoLinkLogic extends BaseLogic
      * @time   :2025/7/14 16:50
      */
     public function saveLink(){
-        $data = [
-            'project_id' => 1,
-            'data' => [
-                ['da'=>'ce_shi1', 'url'=>'www.baidu.com', 'send_time'=>'2021-07-09 11:12:12'],
-                ['da'=>'ce_shi2', 'url'=>'www.baidu1.com', 'send_time'=>'2021-07-10 11:13:12'],
-            ],
-        ];
         try {
             if(!empty($this->param['data'])){
                 $data = [];

@@ -137,7 +137,7 @@ class GeoQuestionResLogic extends BaseLogic
      * @time   :2025/7/21 16:36
      */
     public function getSearchDate(){
-        $dates = $this->model->select(DB::raw('DATE(created_at) as date_only'))->distinct()->pluck('date_only');
+        $dates = $this->model->where('project_id',$this->user['project_id'])->select(DB::raw('DATE(created_at) as date_only'))->distinct()->pluck('date_only');
         return $this->success($dates);
     }