From 8f303cbabfb7a383ed9963412a39ef912c1489a0 Mon Sep 17 00:00:00 2001
From: liutong <836164388@qq.com>
Date: Mon, 19 May 2025 11:12:04 +0800
Subject: [PATCH] =?UTF-8?q?refactor(login):=20=E9=87=8D=E6=9E=84=E5=91=98?=
 =?UTF-8?q?=E5=B7=A5=E7=99=BB=E5=BD=95=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加员工登录功能- 优化员工信息查询和状态检查
- 修改登录类型判断逻辑，使用账户类型替代角色ID- 移除不必要的角色查询代码
---
 niucloud/app/service/api/login/LoginService.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/niucloud/app/service/api/login/LoginService.php b/niucloud/app/service/api/login/LoginService.php
index 141f1aca..cff79559 100644
--- a/niucloud/app/service/api/login/LoginService.php
+++ b/niucloud/app/service/api/login/LoginService.php
@@ -349,8 +349,10 @@ class LoginService extends BaseApiService
 
     }
 
+    //员工登陆
     public function loginByPersonnel($params)
     {
+        //查询员工信息
         $member_info = (new Personnel())->where('phone', $params['phone'])->find();
 
         if ($member_info->status != 2) throw new ApiException('账号状态异常禁止登录');
@@ -368,14 +370,13 @@ class LoginService extends BaseApiService
         $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);
         event("PersonnelLogin", $member_info);
 
-        $role = CampusPersonRole::where('person_id',$member_info['id'])->column('role_id');
-
         //login_type|1=教练,2=销售
         $user_type = '';//1=教练,2=销售
-        if(in_array(2,$role) && $params['login_type'] == 2){
+        //判断员工账户的类型是教练还是销售
+        if($member_info['account_type']=='market' && $params['login_type'] == 2){
             //销售登陆
             $user_type = 2;
-        }elseif(in_array(3,$role) && $params['login_type'] == 1){
+        }elseif($member_info['account_type']=='teacher' && $params['login_type'] == 1){
             //教师登陆
             $user_type = 1;
         }