Commit a7dbd7ac5a668236739db5405594c89a5b480df5
1 parent
ee3151f8
fix:DEFECT-1200 新创建的租户管理员从超级管理员账号进入时,直接跳转到修改密码界面
Showing
1 changed file
with
7 additions
and
2 deletions
@@ -238,7 +238,11 @@ | @@ -238,7 +238,11 @@ | ||
238 | const userStore = useUserStore(); | 238 | const userStore = useUserStore(); |
239 | const permissionStore = usePermissionStore(); | 239 | const permissionStore = usePermissionStore(); |
240 | const go = useGo(); | 240 | const go = useGo(); |
241 | - async function handleLoginTenantAdmin(record: { tbUser: string; id: string }) { | 241 | + async function handleLoginTenantAdmin(record: { |
242 | + tbUser: string; | ||
243 | + id: string; | ||
244 | + hasPassword: boolean; | ||
245 | + }) { | ||
242 | try { | 246 | try { |
243 | const { token, refreshToken } = await getUserToken(record.id); | 247 | const { token, refreshToken } = await getUserToken(record.id); |
244 | userStore.storeToken(token, refreshToken); | 248 | userStore.storeToken(token, refreshToken); |
@@ -253,7 +257,8 @@ | @@ -253,7 +257,8 @@ | ||
253 | }); | 257 | }); |
254 | router.addRoute(PAGE_NOT_FOUND_ROUTE as unknown as RouteRecordRaw); | 258 | router.addRoute(PAGE_NOT_FOUND_ROUTE as unknown as RouteRecordRaw); |
255 | permissionStore.setDynamicAddedRoute(true); | 259 | permissionStore.setDynamicAddedRoute(true); |
256 | - go(PageEnum.BASE_HOME); | 260 | + if (record?.hasPassword) go(PageEnum.BASE_HOME); |
261 | + else go(PageEnum.SYSTEM_PASSWORD); | ||
257 | } catch (error) { | 262 | } catch (error) { |
258 | } finally { | 263 | } finally { |
259 | } | 264 | } |