From e4c982a1a2ee51757869df2bfcacbca15bf71b38 Mon Sep 17 00:00:00 2001
From: wangzeyan <258785420@qq.com>
Date: Mon, 16 Jun 2025 18:19:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 niucloud/app/common.php                        |  6 +++++-
 .../app/service/api/login/LoginService.php     | 18 ++++++------------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/niucloud/app/common.php b/niucloud/app/common.php
index c3e56fb4..10d6aa5c 100644
--- a/niucloud/app/common.php
+++ b/niucloud/app/common.php
@@ -1266,4 +1266,8 @@ function get_role_type($role_id)
     ];
     $dept = \app\model\sys\SysRole::find($role_id);
     return $role_type[$dept->dept_id] ?? 'other';
-}
\ No newline at end of file
+}
+
+/**
+ * 获取顶级部门
+ */
\ No newline at end of file
diff --git a/niucloud/app/service/api/login/LoginService.php b/niucloud/app/service/api/login/LoginService.php
index 3ce056fa..0cbf1284 100644
--- a/niucloud/app/service/api/login/LoginService.php
+++ b/niucloud/app/service/api/login/LoginService.php
@@ -371,18 +371,12 @@ 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);
-        event("PersonnelLogin", $member_info);
-
-        //login_type|1=教练,2=销售
-        $user_type = '';//1=教练,2=销售
-        //判断员工账户的类型是教练还是销售
-        if($member_info['account_type']=='market' && $params['login_type'] == 2){
-            //销售登陆
-            $user_type = 2;
-        }elseif($member_info['account_type']=='teacher' && $params['login_type'] == 1){
-            //教师登陆
-            $user_type = 1;
-        }
+//
+        $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);
 
         return [
             'token' => $token_info['token'],//token