diff --git a/src/main.jsx b/src/main.jsx
index d3f498d..054b935 100644
--- a/src/main.jsx
+++ b/src/main.jsx
@@ -44,6 +44,8 @@ const { loginToken, userId } = usingStorage()
const initAppliction = async () => {
if (isNotEmpty(loginToken)) {
appendRequestParams('token', loginToken)
+ appendRequestParams('lmi_sn', userId)
+
}
if (isNotEmpty(userId)) {
@@ -70,14 +72,14 @@ const router = createBrowserRouter([
{ path: "feedback/:GRI_SN/:CII_SN/:RefNo", element: },
{ path: "feedback/:GRI_SN/:RefNo", element: },
{ path: "report", element: },
- { path: "notice", element: },
- { path: "notice/:CCP_BLID", element: },
+ { path: "notice", element: },
+ { path: "notice/:CCP_BLID", element: },
{ path: "invoice",element:},
{ path: "invoice/detail/:GMDSN/:GSN",element:},
{ path: "invoice/paid",element:},
{ path: "invoice/paid/detail/:flid", element: },
{ path: "airticket",element: },
- { path: "airticket/plan/:coli_sn",element:},
+ { path: "airticket/plan/:coli_sn",element:},
]
},
{
diff --git a/src/stores/Account.js b/src/stores/Account.js
index 804299a..01010d8 100644
--- a/src/stores/Account.js
+++ b/src/stores/Account.js
@@ -70,11 +70,11 @@ const useAccountStore = create((set, get) => ({
accountList: [],
- disableAccount: async (accountId) => {
+ disableAccount: async (userId) => {
const formData = new FormData()
- formData.append('wu_id', accountId)
- // enable disable
+ formData.append('lmi_sn', userId)
+ // enable | disable
formData.append('account_status', 'disable')
const result = await postAccountStatus(formData)
@@ -82,10 +82,10 @@ const useAccountStore = create((set, get) => ({
console.info(result)
},
- resetAccountPassword: async (accountId, password) => {
+ resetAccountPassword: async (userId, password) => {
const formData = new FormData()
- formData.append('wu_id', accountId)
+ formData.append('lmi_sn', userId)
formData.append('newPassword', password)
return postAccountPassword(formData)
@@ -111,8 +111,8 @@ const useAccountStore = create((set, get) => ({
saveOrUpdateAccount: async (formValues) => {
const { userId } = usingStorage()
const formData = new FormData()
- formData.append('wu_id', formValues.userId)
- formData.append('lmi_sn', formValues.lmi_sn)
+ formData.append('wu_id', formValues.accountId)
+ formData.append('lmi_sn', formValues.userId)
formData.append('lmi2_sn', formValues.lmi2_sn)
formData.append('user_name', formValues.username)
formData.append('real_name', formValues.realname)
@@ -138,8 +138,8 @@ const useAccountStore = create((set, get) => ({
const mapAccoutList = resultArray.map((r) => {
return {
- userId: r.wu_id,
- lmi_sn: r.lmi_sn,
+ accountId: r.wu_id,
+ userId: r.lmi_sn,
lmi2_sn: r.lmi2_sn,
username: r.user_name,
realname: r.real_name,
diff --git a/src/stores/Auth.js b/src/stores/Auth.js
index 6e59ed9..8374151 100644
--- a/src/stores/Auth.js
+++ b/src/stores/Auth.js
@@ -36,7 +36,7 @@ export const fetchUserDetail = async (loginToken) => {
export const fetchPermissionListByUserId = async (userId) => {
const { errcode, result } = await fetchJSON(
- `${HT_HOST}/service-CooperateSOA/get_account_permission_list`, { wu_id: userId})
+ `${HT_HOST}/service-CooperateSOA/get_account_permission_list`, { lmi_sn: userId})
return errcode !== 0 ? {} : result
}
@@ -71,7 +71,7 @@ const useAuthStore = create(obervseLifecycle((set, get) => ({
// 以上是 Hardcode 判断
// 以下是权限列表从数据库读取后使用的方法
return permissionList.some((value) => {
- if (value.indexOf(WILDCARD_TOKEN) > -1) {
+ if (value.indexOf(WILDCARD_TOKEN) == 0) {
return true
}
if (value === perm) {
@@ -85,9 +85,9 @@ const useAuthStore = create(obervseLifecycle((set, get) => ({
const { startTokenInterval, loadUserPermission } = get()
const { setStorage } = usingStorage()
- const { token: loginToken, WU_ID: userId } = await fetchLoginToken(usr, pwd)
+ const { token: loginToken } = await fetchLoginToken(usr, pwd)
const userDetail = await fetchUserDetail(loginToken)
- await loadUserPermission(userId)
+ await loadUserPermission(userDetail.LMI_SN)
set(() => ({
tokenTimeout: false,
@@ -95,7 +95,7 @@ const useAuthStore = create(obervseLifecycle((set, get) => ({
}))
setStorage(KEY_LOGIN_TOKEN, loginToken)
- setStorage(KEY_USER_ID, userId)//userDetail.LMI_SN)
+ setStorage(KEY_USER_ID, userDetail.LMI_SN)
setStorage(KEY_TRAVEL_AGENCY_ID, userDetail.LMI_VEI_SN)
appendRequestParams('token', loginToken)
// loadPageSpy(`${json.Result.VName}-${json.Result.LoginName}`)
diff --git a/src/views/account/Management.jsx b/src/views/account/Management.jsx
index 8a498dc..676ed9a 100644
--- a/src/views/account/Management.jsx
+++ b/src/views/account/Management.jsx
@@ -106,7 +106,6 @@ function Management() {
}
const onAccountSeleted = async (account) => {
- console.info(account)
setTravelAgencyList([{
label: account.travelAgencyName,
value: account.travelAgencyId
@@ -154,7 +153,6 @@ function Management() {
}
const handleTravelAgencyChange = (newValue) => {
- console.info(newValue)
setCurrentTravelAgency(newValue)
}
@@ -222,8 +220,8 @@ function Management() {
)}
>
+
-