Merge remote-tracking branch 'origin/develop' into akun

@@ -75,8 +75,6 @@ class OptimizeController extends BaseController
         $item['keyword_num'] = $item['key'] ?? 0;
         $item['keyword_num'] = $item['key'] ?? 0;
         $item['autologin_code'] = getAutoLoginCode($item['id']);
         $item['autologin_code'] = getAutoLoginCode($item['id']);
 //        $item['article_num'] = ($data['blog'] ?? 0) + ($data['news'] ?? 0);
 //        $item['article_num'] = ($data['blog'] ?? 0) + ($data['news'] ?? 0);
-//        $item['task_finish_num'] = Task::getNumByProjectId($item['id'], Task::STATUS_DOWN);
-//        $item['task_pending_num'] = Task::getNumByProjectId($item['id'], [Task::STATUS_DONGING, Task::STATUS_WAIT]);
         return $item;
         return $item;
     }
     }
     /**
     /**
@@ -136,12 +134,33 @@ class OptimizeController extends BaseController
      */
      */
     public function searchParam(&$query){
     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'].'%');
             $query = $query->where('gl_project.title','like','%'.$this->map['title'].'%');
         }
         }
-        if(isset($this->map['special'])){
+        if(isset($this->map['special']) && !empty($this->map['special'])){
             $query = $query->where('gl_project_deploy_optimize.special','like','%'.$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['channel_id']) && !empty($this->map['channel_id'])){
+            $query->where(function ($subQuery) {
+                $subQuery->orWhere('gl_project.channel','like','%"channel_id": "'.$this->map['channel_id'].'"%')
+                    ->orWhere('gl_project.channel','like','%"channel_id": '.$this->map['channel_id'].'%');
+            });
+        }
         $query = $query->whereIn('gl_project.type',[2,4]);//TODO::2,4代表优化项目
         $query = $query->whereIn('gl_project.type',[2,4]);//TODO::2,4代表优化项目
         return $query;
         return $query;
     }
     }

@@ -48,9 +48,9 @@ class Channel extends Model
             $user['id'] = $userModel->addReturnId($data);
             $user['id'] = $userModel->addReturnId($data);
         }
         }
         return [
         return [
-            'zone_id' => $channel['zone_id'] ?? 0,
-            'channel_id' => $channel['id'] ?? 0,
-            'user_id' => $user['id'] ?? 0,
+            'zone_id' => (string)$channel['zone_id'] ?? 0,
+            'channel_id' => (string)$channel['id'] ?? 0,
+            'user_id' => (string)$user['id'] ?? 0,
         ];
         ];
     }
     }