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

变更数据



查看合并请求 !2857

@@ -123,10 +123,10 @@ class TicketUploadDataController extends BaseController
         if ($this->param['type'] == 1) {
         if ($this->param['type'] == 1) {
             //todo::搜索获取分类
             //todo::搜索获取分类
             $productCateModel = new Category();
             $productCateModel = new Category();
-            $data = $productCateModel->lists(['title' => ['like','%' . $this->param['search'] . '%']], 1, 20);
+            $data = $productCateModel->lists(['title' => ['like','%' . $this->param['search'] . '%']], 1, 20,'id',['id','title']);
         } else {
         } else {
             $keywordModel = new Keyword();
             $keywordModel = new Keyword();
-            $data = $keywordModel->lists(['title' => ['like','%' . $this->param['search'] . '%']], 1, 20);
+            $data = $keywordModel->lists(['title' => ['like','%' . $this->param['search'] . '%']], 1, 20,'id',['id','title']);
         }
         }
         DB::disconnect('custom_mysql');
         DB::disconnect('custom_mysql');
         $this->response('success', Code::SUCCESS, $data);
         $this->response('success', Code::SUCCESS, $data);
@@ -150,7 +150,7 @@ class TicketUploadDataController extends BaseController
         ]);
         ]);
         ProjectServer::useProject($this->param['project_id']);
         ProjectServer::useProject($this->param['project_id']);
         $blogCateModel = new BlogCategory();
         $blogCateModel = new BlogCategory();
-        $data = $blogCateModel->lists(['name' => ['like' ,'%' . $this->param['search'] . '%']], 1, 20);
+        $data = $blogCateModel->lists(['name' => ['like' ,'%' . $this->param['search'] . '%']], 1, 20,'id',['id','name']);
         DB::disconnect('custom_mysql');
         DB::disconnect('custom_mysql');
         $this->response('success', Code::SUCCESS, $data);
         $this->response('success', Code::SUCCESS, $data);
     }
     }
@@ -173,7 +173,7 @@ class TicketUploadDataController extends BaseController
         ]);
         ]);
         ProjectServer::useProject($this->param['project_id']);
         ProjectServer::useProject($this->param['project_id']);
         $newsCateModel = new NewsCategory();
         $newsCateModel = new NewsCategory();
-        $data = $newsCateModel->lists(['name' => ['like' , '%' . $this->param['search'] . '%']], 1, 20);
+        $data = $newsCateModel->lists(['name' => ['like' , '%' . $this->param['search'] . '%']], 1, 20,'id',['id','name']);
         DB::disconnect('custom_mysql');
         DB::disconnect('custom_mysql');
         $this->response('success', Code::SUCCESS, $data);
         $this->response('success', Code::SUCCESS, $data);
     }
     }