Compare commits
3 Commits
ae001252b0
...
0d82bd27b3
| Author | SHA1 | Date | |
|---|---|---|---|
| 0d82bd27b3 | |||
| bcae1cd06e | |||
| d332721f5c |
@@ -85,7 +85,7 @@ class Ticket extends BaseController
|
|||||||
*/
|
*/
|
||||||
public function batchUpdate(TicketService $ticketService)
|
public function batchUpdate(TicketService $ticketService)
|
||||||
{
|
{
|
||||||
$adminId = Session::get('user_info.id'); // 获取当前登录管理员ID
|
$adminId = Session::get('user_info.id'); // 获取管理员身份
|
||||||
$data = $this->request->post();
|
$data = $this->request->post();
|
||||||
|
|
||||||
$ids = $data['ids'] ?? [];
|
$ids = $data['ids'] ?? [];
|
||||||
|
|||||||
@@ -14,8 +14,8 @@ class AuthService
|
|||||||
public function login(string $username, string $password)
|
public function login(string $username, string $password)
|
||||||
{
|
{
|
||||||
$user = User::with(['company'])
|
$user = User::with(['company'])
|
||||||
->where('username', $username)
|
->where('username', $username)
|
||||||
->find();
|
->find();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -29,6 +29,7 @@ class AuthService
|
|||||||
|
|
||||||
|
|
||||||
$userInfo = [
|
$userInfo = [
|
||||||
|
'id' => $user['id'], // 用户ID
|
||||||
'company_name' => $user['company']['company_name'], // 所属公司名称
|
'company_name' => $user['company']['company_name'], // 所属公司名称
|
||||||
'username' => $user['username'],
|
'username' => $user['username'],
|
||||||
'role' => $user['role'],
|
'role' => $user['role'],
|
||||||
@@ -37,6 +38,5 @@ class AuthService
|
|||||||
Session::set('user_info', $user);
|
Session::set('user_info', $user);
|
||||||
|
|
||||||
return $userInfo;
|
return $userInfo;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,11 +25,10 @@ class Login extends BaseController
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
$result = $authService->login($params['username'], $params['password']);
|
$result = $authService->login($params['username'], $params['password']);
|
||||||
|
return json(['code' => 200, 'message' => '登录成功', 'data' => $result]);
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
return json(['code' => 400, 'message' => $e->getMessage(),'data' => []]);
|
return json(['code' => 400, 'message' => $e->getMessage(), 'data' => []]);
|
||||||
}
|
}
|
||||||
|
|
||||||
return json(['code' => 200, 'message' => '登录成功', 'data' => $result]);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
Reference in New Issue
Block a user