From f80304b9a449919a984df92393f239843baca4fa Mon Sep 17 00:00:00 2001
From: wangzeyan <258785420@qq.com>
Date: Mon, 16 Jun 2025 19:08:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 niucloud/app/api/controller/login/Login.php     | 10 ----------
 niucloud/app/service/api/login/LoginService.php |  9 +++------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/niucloud/app/api/controller/login/Login.php b/niucloud/app/api/controller/login/Login.php
index 2ad930a0..6e2d3426 100644
--- a/niucloud/app/api/controller/login/Login.php
+++ b/niucloud/app/api/controller/login/Login.php
@@ -125,16 +125,6 @@ class Login extends BaseController
         ]);
         //验证码验证
         $result = (new LoginService())->loginByPersonnel($data);
-
-        if(!$result['user_type']){
-            if($data['login_type'] == 1){
-                $msg = '暂无教练权限';
-            }else{
-                $msg = '暂无销售权限';
-            }
-            return fail($msg);//code|0错误
-        }
-
         return success($result);//code|1正确
     }
 
diff --git a/niucloud/app/service/api/login/LoginService.php b/niucloud/app/service/api/login/LoginService.php
index 0cbf1284..b1537d94 100644
--- a/niucloud/app/service/api/login/LoginService.php
+++ b/niucloud/app/service/api/login/LoginService.php
@@ -354,6 +354,7 @@ class LoginService extends BaseApiService
     {
         //查询员工信息
         $member_info = (new Personnel())->where('phone', $params['phone'])->find();
+
         if(!$member_info){
             throw new ApiException('账号不存在');
         }
@@ -371,13 +372,9 @@ class LoginService extends BaseApiService
         $expire_time = env('system.api_token_expire_time') ?? 3600;
         //生成token
         $token_info = TokenAuth::createToken($member_info->id, AppTypeDict::PERSONNEL, ['id' => $member_info->id, 'member_id'=>$member_info->id, 'phone' => $member_info->phone, 'user_type' => $params['login_type']], $expire_time);
-//
+        //获取用户部门ids（1市场、2教师、3销售）
         $depts = (new CampusPersonRole())->where('person_id', $member_info->id)->column('dept_id');
-
-        $user_type = CampusPersonRole::where('person_id', $member_info->id)->
-        $event = event("PersonnelLogin", $member_info);
-        dd($event);
-
+        $user_type = in_array($params['login_type'],$depts) ? $params['login_type'] : '';
         return [
             'token' => $token_info['token'],//token
             'expires_time' => $token_info['params']['exp'],//过期时间