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

gx数据



查看合并请求 !921

@@ -39,6 +39,12 @@ class AllProjectController extends BaseController
         if(isset($this->map['test_domain']) && !empty($this->map['test_domain'])){
             $this->map['test_domain'] = ['like','%'.$this->map['test_domain'].'%'];
         }
+        if(isset($this->map['title']) && !empty($this->map['title'])){
+            $this->map['title'] = ['like','%'.$this->map['title'].'%'];
+        }
+        if(isset($this->map['company']) && !empty($this->map['company'])){
+            $this->map['company'] = ['like','%'.$this->map['company'].'%'];
+        }
         $data = $allProject->lists($this->map,$this->page,$this->row);
         $this->response('success',Code::SUCCESS,$data);
     }