Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into bate

@@ -239,7 +239,7 @@ class OptimizeController extends BaseController
         }
         }
         if(isset($this->map['channel_id']) && !empty($this->map['channel_id'])){
         if(isset($this->map['channel_id']) && !empty($this->map['channel_id'])){
             $query->where(function ($subQuery) {
             $query->where(function ($subQuery) {
-                $subQuery->orWhere('gl_project.channel','like','%"zone_id": "'.$this->map['channel_id'].'"%')
+                $subQuery->orWhere('gl_project.channel','like','%"channel_id": "'.$this->map['channel_id'].'"%')
                     ->orWhere('gl_project.channel','like','%"zone_id": '.$this->map['channel_id'].'%');
                     ->orWhere('gl_project.channel','like','%"zone_id": '.$this->map['channel_id'].'%');
             });
             });
         }
         }

@@ -114,8 +114,6 @@ class ProjectController extends BaseController
             '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.api_no AS api_no',
             'gl_project_deploy_optimize.api_no AS api_no',
-            'gl_project_deploy_optimize.brand_keyword AS brand_keyword',
-            'gl_project_deploy_optimize.inquiry_prompt AS inquiry_prompt'
         ];
         ];
         return $select;
         return $select;
     }
     }

@@ -49,6 +49,10 @@ class LoginLogic extends BaseLogic
         if (Manage::STATUS_DISABLE == $manage->status) {
         if (Manage::STATUS_DISABLE == $manage->status) {
             $this->fail('帐号已被禁用');
             $this->fail('帐号已被禁用');
         }
         }
+        $hrStatus = ManageHr::where('manage_id', $manage['id'])->value('status')?:1;
+        if($hrStatus != ManageHr::STATUS_ONE){
+            $this->fail('当前员工已离职');
+        }
         $type = 1;//账号密码登录
         $type = 1;//账号密码登录
         if (!Hash::check($this->param['password'], $manage->password)) {
         if (!Hash::check($this->param['password'], $manage->password)) {
             //验证验证码
             //验证验证码

@@ -564,6 +564,9 @@ class ProjectLogic extends BaseLogic
             case Project::TYPE_ONE:
             case Project::TYPE_ONE:
                 return Zone::pluck('title', 'id')->toArray();
                 return Zone::pluck('title', 'id')->toArray();
             case Project::TYPE_TWO:
             case Project::TYPE_TWO:
+                if(isset($param['alias'])){
+                    return Channel::where('alias', 'like' ,'%'.$param['alias'].'%')->pluck('alias', 'id')->toArray();
+                }
                 return Channel::where('zone_id', $param['zone_id']??0)->pluck('alias', 'id')->toArray();
                 return Channel::where('zone_id', $param['zone_id']??0)->pluck('alias', 'id')->toArray();
             case Project::TYPE_THREE:
             case Project::TYPE_THREE:
                 return User::where('channel_id', $param['channel_id']??0)->pluck('name', 'id')->toArray();
                 return User::where('channel_id', $param['channel_id']??0)->pluck('name', 'id')->toArray();