From d2cb36959b65ece32cec7e2db4d6764f5c788b1d Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期三, 30 四月 2025 08:33:24 +0800 Subject: [PATCH] 1. 波次删除判断是否有子任务列表 2. 任务明细添加字段:执行数量,完成数量, 源单据号,源单据ID --- rsf-admin/src/config/authProvider.js | 37 ++++++++++++++++++------------------- 1 files changed, 18 insertions(+), 19 deletions(-) diff --git a/rsf-admin/src/config/authProvider.js b/rsf-admin/src/config/authProvider.js index b74bab3..97820b0 100644 --- a/rsf-admin/src/config/authProvider.js +++ b/rsf-admin/src/config/authProvider.js @@ -6,31 +6,30 @@ const AuthProvider = { // login - login: async ({ username, password }) => { - - const { accessToken, user } = await login({ + login: async ({ username, password, tenantId }) => { + const { code, msg, data } = await login({ username: username, password: password, - hostId: 1, - }); + tenantId: tenantId, + }) - if (user && accessToken) { - const userToPersist = { - avatar: avatar, - fullName: user.nickname, - id: user.id, - username: user.username + if (code === 200) { + const { accessToken, user, tenant } = data; + if (user && accessToken) { + const userToPersist = { + avatar: avatar, + fullName: user.nickname, + id: user.id, + username: user.username, + tenant: tenant, + } + setToken(accessToken); + localStorage.setItem("user", JSON.stringify(userToPersist)); + return Promise.resolve(); } - setToken(accessToken); - localStorage.setItem("user", JSON.stringify(userToPersist)); - return Promise.resolve(); } - return Promise.reject( - new HttpError("Unauthorized", 401, { - message: "Invalid username or password", - }), - ); + return Promise.reject({ code, msg, data }); }, // logout logout: () => { -- Gitblit v1.9.1