gx

@@ -117,7 +117,7 @@ if (!function_exists('_get_child')) {
     function _get_child($my_id, $arr)
     function _get_child($my_id, $arr)
     {
     {
         $new_arr = array();
         $new_arr = array();
-        foreach ($arr as $k => $v) {
+        foreach ($arr as $v) {
             $v = (array)$v;
             $v = (array)$v;
             if ($v['pid'] == $my_id) {
             if ($v['pid'] == $my_id) {
                 $v['sub']  = _get_child($v['id'], $arr);
                 $v['sub']  = _get_child($v['id'], $arr);

@@ -94,6 +94,7 @@ class OptimizeController extends BaseController
             'gl_project.created_at AS created_at',
             'gl_project.created_at AS created_at',
             'gl_project.cooperate_date AS cooperate_date',
             'gl_project.cooperate_date AS cooperate_date',
             'gl_project.finish_remain_day AS finish_remain_day',
             'gl_project.finish_remain_day AS finish_remain_day',
+            'gl_project.is_remain_today AS is_remain_today',
             'gl_project.remain_day AS remain_day',
             'gl_project.remain_day AS remain_day',
             'gl_project_online_check.id AS online_check_id',
             'gl_project_online_check.id AS online_check_id',
             'gl_project_online_check.question AS question',
             'gl_project_online_check.question AS question',
@@ -120,7 +121,6 @@ class OptimizeController extends BaseController
             'gl_project_deploy_optimize.domain AS domain',
             'gl_project_deploy_optimize.domain AS domain',
             'gl_project_deploy_optimize.quality_mid AS quality_mid',
             'gl_project_deploy_optimize.quality_mid AS quality_mid',
             'gl_project_deploy_optimize.design_mid AS design_mid',
             'gl_project_deploy_optimize.design_mid AS design_mid',
-            'gl_project_deploy_optimize.special AS special',
         ];
         ];
         return $select;
         return $select;
     }
     }
@@ -134,39 +134,9 @@ class OptimizeController extends BaseController
      */
      */
     public function searchParam(&$query){
     public function searchParam(&$query){
         //搜索条件处理
         //搜索条件处理
-        if(isset($this->map['title']) && !empty($this->map['title'])){
+        if(isset($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']) && !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代表优化项目
         $query = $query->whereIn('gl_project.type',[2,4]);//TODO::2,4代表优化项目
         return $query;
         return $query;
     }
     }