fix: return code -1 when disabled user has token in getResourceList, triggers frontend logout
This commit is contained in:
@@ -26,8 +26,9 @@
|
||||
|
||||
<el-table :data="tableData" v-loading="loading">
|
||||
<!-- <el-table-column prop="id" label="ID" width="80" /> -->
|
||||
<el-table-column prop="phone" label="手机号" width="140" />
|
||||
<el-table-column prop="status" label="状态" width="100">
|
||||
<el-table-column prop="phone" label="手机号" />
|
||||
<el-table-column prop="create_time" label="创建时间" width="180" />
|
||||
<el-table-column prop="status" label="状态" width="100">
|
||||
<template #default="{ row }">
|
||||
<el-switch
|
||||
v-model="row.status"
|
||||
@@ -40,7 +41,6 @@
|
||||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="create_time" label="创建时间" width="180" />
|
||||
<el-table-column label="操作" width="200" fixed="right">
|
||||
<template #default="{ row }">
|
||||
<el-button type="primary" link @click="handleEdit(row)">编辑</el-button>
|
||||
|
||||
@@ -102,6 +102,7 @@ class AssetAppController extends BaseApiController
|
||||
*/
|
||||
public function getResourceList()
|
||||
{
|
||||
$token = $this->request->header('token');
|
||||
$user = $this->getAssetUser();
|
||||
$type = $this->request->get('type', 1);
|
||||
$pageNo = $this->request->get('page_no', 1);
|
||||
@@ -109,6 +110,11 @@ class AssetAppController extends BaseApiController
|
||||
$days = (int)$this->request->get('days', 0);
|
||||
$usageStatus = (int)$this->request->get('usage_status', 0); // 0=全部, 1=未使用, 2=已使用
|
||||
|
||||
// 携带了 token 但用户无效(被禁用/过期),返回 -1 触发前端重新登录
|
||||
if (!empty($token) && !$user) {
|
||||
return $this->fail('账号已被禁用或登录已过期,请重新登录', [], -1);
|
||||
}
|
||||
|
||||
$query = AssetResource::where('type', $type);
|
||||
$usedResourceIds = [];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user