gx

@@ -140,9 +140,39 @@ class OptimizeController extends BaseController
      */
     public function searchParam(&$query){
         //搜索条件处理
-        if(isset($this->map['title'])){
+        if(isset($this->map['title']) && !empty($this->map['title'])){
             $query = $query->where('gl_project.title','like','%'.$this->map['title'].'%');
         }
+        if(isset($this->map['special']) && !empty($this->map['special'])){
+            $query = $query->where('gl_project_deploy_optimize.special','like','%'.$this->map['special'].'%');
+        }
+        if(isset($this->map['manager_mid']) && !empty($this->map['manager_mid'])){
+            $query = $query->where('gl_project_deploy_build.manager_mid','like','%'.$this->map['manager_mid'].'%');
+        }
+        if(isset($this->map['optimize_manager_mid']) && !empty($this->map['optimize_manager_mid'])){
+            $query = $query->where('gl_project_deploy_optimize.manager_mid','like','%'.$this->map['optimize_manager_mid'].'%');
+        }
+        if(isset($this->map['optimize_tech_mid']) && !empty($this->map['optimize_tech_mid'])){
+            $query = $query->where('gl_project_deploy_optimize.tech_mid','like','%'.$this->map['optimize_tech_mid'].'%');
+        }
+        if(isset($this->map['optimize_optimist_mid']) && !empty($this->map['optimize_optimist_mid'])){
+            $query = $query->where('gl_project_deploy_optimize.optimist_mid','like','%'.$this->map['optimize_optimist_mid'].'%');
+        }
+        if(isset($this->map['optimize_assist_mid']) && !empty($this->map['optimize_assist_mid'])){
+            $query = $query->where('gl_project_deploy_optimize.assist_mid','like','%'.$this->map['optimize_assist_mid'].'%');
+        }
+        if(isset($this->map['user_id']) && !empty($this->map['user_id'])){
+            $query->where(function ($subQuery) {
+                $subQuery->orWhere('gl_project.channel','like','%"user_id": "'.$this->map['user_id'].'"%')
+                    ->orWhere('gl_project.channel','like','%"user_id": '.$this->map['user_id'].'%');
+            });
+        }
+        if(isset($this->map['domain']) && !empty($this->map['domain'])){
+            $query = $query->where('gl_project_deploy_optimize.domain','like','%'.$this->map['domain'].'%');
+        }
+        if(isset($this->map['test_domain']) && !empty($this->map['test_domain'])){
+            $query = $query->where('gl_project_deploy_build.test_domain','like','%'.$this->map['test_domain'].'%');
+        }
         $query = $query->whereIn('gl_project.type',[2,4]);//TODO::2,4代表优化项目
         return $query;
     }

@@ -110,7 +110,7 @@ class CNoticeController extends BaseController
                 $extent = json_encode(['url'=>$this->param['url'],'language'=>$this->param['language']]);
                 $this->addProgress($count,$this->param['type'],$this->param['page'],$extent);
             }
-            //更新小语种，同步更新项目表
+            //更新小语种，同步更新项目表已翻译小语种
             if(isset($this->user['is_domain']) && ($this->user['is_domain'] != 0)){
                 $projectModel = new Project();
                 $projectModel->edit(['is_language'=>$this->user['is_domain']],['id'=>$this->user['project_id']]);