Browse Source

发送消息方法

cqpCow 1 year ago
parent
commit
92f0d207f6
2 changed files with 2 additions and 2 deletions
  1. 1 1
      app/Http/Controllers/Api/LoginController.php
  2. 1 1
      app/Service/EmployeeService.php

+ 1 - 1
app/Http/Controllers/Api/LoginController.php

@@ -20,6 +20,6 @@ class LoginController extends BaseController
         //生成token
         $jwtToken = TokenService::getToken($return['id']);
 
-        return $this->json_return(200,'', ['id' => $return['id'],'token' => $jwtToken, 'emp_name'=>$return['name'],'is_main'=>$return['is_main'],'top_depart_id'=>$return['top_depart_id'],'top_depart_title'=>$return['top_depart_title']]);
+        return $this->json_return(200,'', ['id' => $return['id'],'token' => $jwtToken, 'emp_name'=>$return['name'],'is_main'=>$return['is_main'],'top_depart_id'=>$return['top_depart_id'],'top_depart_title'=>$return['top_depart_title'], 'all_top' => $return['all_top']]);
     }
 }

+ 1 - 1
app/Service/EmployeeService.php

@@ -1107,7 +1107,7 @@ class EmployeeService extends Service
         $depart_top_title = $depart_top[0]['title'] ?? "";
         $depart_top_id = $depart_top[0]['depart_id'] ?? 0;
 
-        return [true, ['id'=>$res['id'], 'name'=>$res['emp_name'], 'is_main' => $is_main, 'top_depart_id' => $depart_top_id,'top_depart_title' => $depart_top_title]];
+        return [true, ['id'=>$res['id'], 'name'=>$res['emp_name'], 'is_main' => $is_main, 'top_depart_id' => $depart_top_id,'top_depart_title' => $depart_top_title,'all_top'=> $depart_top]];
     }
 
     /**