From 31308d09573751f3c1e06a03a68d25aef9bcc06a Mon Sep 17 00:00:00 2001
From: wangzeyan <258785420@qq.com>
Date: Mon, 23 Jun 2025 14:00:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 niucloud/app/api/controller/member/Member.php   |  5 ++++-
 niucloud/app/api/route/member.php               |  5 -----
 niucloud/app/api/route/route.php                |  2 ++
 niucloud/app/service/api/login/LoginService.php | 11 ++++-------
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/niucloud/app/api/controller/member/Member.php b/niucloud/app/api/controller/member/Member.php
index 25a4b059..2009b748 100644
--- a/niucloud/app/api/controller/member/Member.php
+++ b/niucloud/app/api/controller/member/Member.php
@@ -121,6 +121,9 @@ class Member extends BaseApiController
     }
 
     public function list_call_up(){
-        return success(( new MemberService() )->list_call_up());
+        $data = $this->request->params([
+            [ 'sales_id', '' ],
+        ]);
+        return success(( new MemberService() )->list_call_up($data['sales_id']));
     }
 }
diff --git a/niucloud/app/api/route/member.php b/niucloud/app/api/route/member.php
index 6d4dbbad..a05e0cb3 100644
--- a/niucloud/app/api/route/member.php
+++ b/niucloud/app/api/route/member.php
@@ -105,11 +105,6 @@ Route::group('member', function () {
     //获取签到设置
     Route::get('sign/config', 'member.MemberSign/signConfig');
 
-    Route::get('list_call_up', 'member.MemberSign/signConfig');
-
-
-
-
 })->middleware(ApiChannel::class)
     ->middleware(ApiCheckToken::class, true)
     ->middleware(ApiLog::class);
diff --git a/niucloud/app/api/route/route.php b/niucloud/app/api/route/route.php
index ec2a4e3e..db3c2fb4 100644
--- a/niucloud/app/api/route/route.php
+++ b/niucloud/app/api/route/route.php
@@ -331,6 +331,8 @@ Route::group(function () {
     Route::get('teachingResearch/teachingTestPaper', 'apiController.teachingResearch/teachingTestPaper');
     //提交试卷
     Route::get('teachingResearch/submitTestPaper', 'apiController.teachingResearch/submitTestPaper');
+
+    Route::get('per_list_call_up', 'member.Member/list_call_up');
 })->middleware(ApiChannel::class)
     ->middleware(ApiPersonnelCheckToken::class, true)
     ->middleware(ApiLog::class);
diff --git a/niucloud/app/service/api/login/LoginService.php b/niucloud/app/service/api/login/LoginService.php
index 59c5a239..2908673c 100644
--- a/niucloud/app/service/api/login/LoginService.php
+++ b/niucloud/app/service/api/login/LoginService.php
@@ -177,6 +177,7 @@ class LoginService extends BaseApiService
 
         try {
             $token_info = TokenAuth::parseToken($token, AppTypeDict::API);
+            dd($token_info);
         } catch (Throwable $e) {
 //            if(env('app_debug', false)){
 //                throw new AuthException($e->getMessage(), 401);
@@ -206,11 +207,7 @@ class LoginService extends BaseApiService
         try {
             $token_info = TokenAuth::parseToken($token, AppTypeDict::PERSONNEL);
         } catch (Throwable $e) {
-//            if(env('app_debug', false)){
-//                throw new AuthException($e->getMessage(), 401);
-//            }else{
             throw new AuthException('LOGIN_EXPIRE', 401);
-//            }
         }
         if (!$token_info) {
             throw new AuthException('MUST_LOGIN', 401);
@@ -355,7 +352,7 @@ class LoginService extends BaseApiService
         //查询员工信息
         $member_info = (new Personnel())->where('phone', $params['phone'])->find();
 
-        if(!$member_info){
+        if (!$member_info) {
             throw new ApiException('账号不存在');
         }
 
@@ -371,10 +368,10 @@ class LoginService extends BaseApiService
         $user->save();
         $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);
+        $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 = in_array($params['login_type'],$depts) ? $params['login_type'] : '';
+        $user_type = in_array($params['login_type'], $depts) ? $params['login_type'] : '';
 
         return [
             'token' => $token_info['token'],//token