gx

@@ -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'].'%');
             });
             });
         }
         }

@@ -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)) {
             //验证验证码
             //验证验证码