This commit is contained in:
lix
2025-06-20 14:55:00 +08:00
parent eb90574c74
commit f2ef1e81c8
20 changed files with 624 additions and 195 deletions

View File

@ -76,7 +76,7 @@ const Loading: React.FC<{}> = () => {
// } else {
setUserData(userData, userData.authorityList[0].roleCode, userData.authorityList[0]);
// }
await setDict();//存字典
// await setDict();//存字典
setTimeout(() => {
history.push({
pathname: `/${url}`,
@ -89,185 +89,185 @@ const Loading: React.FC<{}> = () => {
//获取用户信息
async function getUserData(token: string, url: string, extra: any, status: number) {
const res = {
"userId": "ex-linjp29",
"lastName": null,
"firstName": null,
"fullName": "林剑萍",
"emailAddress": null,
"loginName": "ex-linjp29",
"mobilePhone": null,
"officePhone": null,
"sex": null,
"employeeCategory": null,
"userType": "1",
"dateOfBirth": null,
"age": null,
"employeeNumber": "1743164896",
"nationalityId": null,
"nationality": null,
"nationalIdentifier": null,
"supervisorId": null,
"organizationId": "101058278",
"organizationName": "湖北信通通信有限公司",
"orgCategory": null,
"deptId": "101058278",
"deptName": "湖北信通通信有限公司",
"roleIds": null,
"bussiGroupId": null,
"positionId": null,
"currentRoleCode": "undefined",
"province": null,
"authorityList": [
{
"roleId": "000009",
"roleName": "代理机构业务经理",
"roleCode": "ebtp-agency-project-manager",
"roleScope": "EBTP",
"authorities": [
"ebtp-agency-project-manager",
null,
"ebtp-agency-project-manager",
"ebtp-agency-project-manager,ebtp-expert,ebtp-supplier,ebtp-agency-admin",
"ebtp-agency-project-manager",
"ebtp-agency-project-manager,ebtp-expert,ebtp-supplier,ebtp-agency-admin",
"ebtp-agency-project-manager",
"ebtp-agency-project-manager",
null,
"ebtp-agency-project-manager",
null,
"ebtp-agency-project-manager",
"ebtp-agency-project-manager",
null,
"ebtp-agency-project-manager,ebtp-expert,ebtp-agency-admin",
null,
null,
"ebtp-agency-admin",
null,
null,
null,
null,
null,
null,
null,
"ebtp-agency-project-manager",
"ebtp-agency-project-manager,ebtp-purchase",
"ebtp-agency-project-manager,ebtp-purchase",
"ebtp-agency-project-manager,ebtp-purchase",
"ebtp-agency-project-manager,ebtp-purchase",
"ebtp-agency-project-manager,ebtp-purchase",
null,
null,
null,
null,
null,
"ebtp-agency-project-manager,ebtp-expert,ebtp-supplier",
"ebtp-agency-project-manager,ebtp-supplier",
"ebtp-agency-project-manager",
"ebtp-agency-project-manager",
null
]
},
{
"roleId": "000006",
"roleName": "供应商",
"roleCode": "ebtp-supplier",
"roleScope": "EBTP",
"authorities": [
"system:user:test",
"ebtp-agency-project-manager,ebtp-expert,ebtp-supplier,ebtp-agency-admin",
"system:user:test",
"ebtp-agency-project-manager",
"ebtp-agency-project-manager,ebtp-expert,ebtp-supplier,ebtp-agency-admin",
"ebtp-supplier",
"ebtp-supplier",
"system:user:test",
"system:user:test",
"ebtp-agency-project-manager,ebtp-expert,ebtp-agency-admin",
"ebtp-supplier",
"system:user:test",
"ebtp-supplier",
"system:user:test",
"ebtp-supplier",
"ebtp-supplier",
"ebtp-supplier",
"ebtp-supplier",
"ebtp-supplier",
"ebtp-supplier",
"ebtp-supplier",
null,
null,
null,
"ebtp-agency-project-manager,ebtp-expert,ebtp-supplier",
"ebtp-agency-project-manager,ebtp-supplier",
"ebtp-supplier",
"system:user:test",
"system:user:test",
"system:user:test",
"ebtp-agency-project-manager",
"system:user:test"
]
}
]
}
if (res?.authorityList == null || res?.authorityList?.length == 0) {
if (url == 'ExamineAndApprove/Announcement' ||
url == 'ExamineAndApprove/ChangeTheAnnouncement' ||
url == 'ExamineAndApprove/Publicity' ||
url == 'ExamineAndApprove/InvitationLetter' ||
url == 'ExamineAndApprove/ExternalReference' ||
url == 'ExamineAndApprove/FailureAnnouncement') {
let newAuthority: any[] = []
newAuthority.push({
authorities: [null, "system:user:test", "system:user:test", "system:user:test", "system:user:test", null, null],
roleCode: "ebtp-unicom-default",
roleId: "20004",
roleName: "联通普通用户",
roleScope: "EBTP"
})
res.authorityList = [...newAuthority];
await redirect(res, url, extra);
// const res = {
// "userId": "ex-linjp29",
// "lastName": null,
// "firstName": null,
// "fullName": "林剑萍",
// "emailAddress": null,
// "loginName": "ex-linjp29",
// "mobilePhone": null,
// "officePhone": null,
// "sex": null,
// "employeeCategory": null,
// "userType": "1",
// "dateOfBirth": null,
// "age": null,
// "employeeNumber": "1743164896",
// "nationalityId": null,
// "nationality": null,
// "nationalIdentifier": null,
// "supervisorId": null,
// "organizationId": "101058278",
// "organizationName": "湖北信通通信有限公司",
// "orgCategory": null,
// "deptId": "101058278",
// "deptName": "湖北信通通信有限公司",
// "roleIds": null,
// "bussiGroupId": null,
// "positionId": null,
// "currentRoleCode": "undefined",
// "province": null,
// "authorityList": [
// {
// "roleId": "000009",
// "roleName": "代理机构业务经理",
// "roleCode": "ebtp-agency-project-manager",
// "roleScope": "EBTP",
// "authorities": [
// "ebtp-agency-project-manager",
// null,
// "ebtp-agency-project-manager",
// "ebtp-agency-project-manager,ebtp-expert,ebtp-supplier,ebtp-agency-admin",
// "ebtp-agency-project-manager",
// "ebtp-agency-project-manager,ebtp-expert,ebtp-supplier,ebtp-agency-admin",
// "ebtp-agency-project-manager",
// "ebtp-agency-project-manager",
// null,
// "ebtp-agency-project-manager",
// null,
// "ebtp-agency-project-manager",
// "ebtp-agency-project-manager",
// null,
// "ebtp-agency-project-manager,ebtp-expert,ebtp-agency-admin",
// null,
// null,
// "ebtp-agency-admin",
// null,
// null,
// null,
// null,
// null,
// null,
// null,
// "ebtp-agency-project-manager",
// "ebtp-agency-project-manager,ebtp-purchase",
// "ebtp-agency-project-manager,ebtp-purchase",
// "ebtp-agency-project-manager,ebtp-purchase",
// "ebtp-agency-project-manager,ebtp-purchase",
// "ebtp-agency-project-manager,ebtp-purchase",
// null,
// null,
// null,
// null,
// null,
// "ebtp-agency-project-manager,ebtp-expert,ebtp-supplier",
// "ebtp-agency-project-manager,ebtp-supplier",
// "ebtp-agency-project-manager",
// "ebtp-agency-project-manager",
// null
// ]
// },
// {
// "roleId": "000006",
// "roleName": "供应商",
// "roleCode": "ebtp-supplier",
// "roleScope": "EBTP",
// "authorities": [
// "system:user:test",
// "ebtp-agency-project-manager,ebtp-expert,ebtp-supplier,ebtp-agency-admin",
// "system:user:test",
// "ebtp-agency-project-manager",
// "ebtp-agency-project-manager,ebtp-expert,ebtp-supplier,ebtp-agency-admin",
// "ebtp-supplier",
// "ebtp-supplier",
// "system:user:test",
// "system:user:test",
// "ebtp-agency-project-manager,ebtp-expert,ebtp-agency-admin",
// "ebtp-supplier",
// "system:user:test",
// "ebtp-supplier",
// "system:user:test",
// "ebtp-supplier",
// "ebtp-supplier",
// "ebtp-supplier",
// "ebtp-supplier",
// "ebtp-supplier",
// "ebtp-supplier",
// "ebtp-supplier",
// null,
// null,
// null,
// "ebtp-agency-project-manager,ebtp-expert,ebtp-supplier",
// "ebtp-agency-project-manager,ebtp-supplier",
// "ebtp-supplier",
// "system:user:test",
// "system:user:test",
// "system:user:test",
// "ebtp-agency-project-manager",
// "system:user:test"
// ]
// }
// ]
// }
// if (res?.authorityList == null || res?.authorityList?.length == 0) {
// if (url == 'ExamineAndApprove/Announcement' ||
// url == 'ExamineAndApprove/ChangeTheAnnouncement' ||
// url == 'ExamineAndApprove/Publicity' ||
// url == 'ExamineAndApprove/InvitationLetter' ||
// url == 'ExamineAndApprove/ExternalReference' ||
// url == 'ExamineAndApprove/FailureAnnouncement') {
// let newAuthority: any[] = []
// newAuthority.push({
// authorities: [null, "system:user:test", "system:user:test", "system:user:test", "system:user:test", null, null],
// roleCode: "ebtp-unicom-default",
// roleId: "20004",
// roleName: "联通普通用户",
// roleScope: "EBTP"
// })
// res.authorityList = [...newAuthority];
// await redirect(res, url, extra);
// }
// }else {
// await redirect(res, url, extra);
// }
fgetUserMsg(token).then(async res => {
if (res) {
if (res?.userType == null) {
error('401');
} else {
if (res?.authorityList == null || res?.authorityList?.length == 0) {
if (url == 'ExamineAndApprove/Announcement' ||
url == 'ExamineAndApprove/ChangeTheAnnouncement' ||
url == 'ExamineAndApprove/Publicity' ||
url == 'ExamineAndApprove/InvitationLetter' ||
url == 'ExamineAndApprove/ExternalReference' ||
url == 'ExamineAndApprove/FailureAnnouncement') {
const newAuthority: any[] = []
newAuthority.push({
authorities: [null, "system:user:test", "system:user:test", "system:user:test", "system:user:test", null, null],
roleCode: "ebtp-cosco-default",
roleId: "20004",
roleName: "普通用户",
roleScope: "EBTP"
})
res.authorityList = [...newAuthority];
await redirect(res, url, extra);
} else {
if (status == 0) {
await refreshUserData(res?.userType, token, url, extra);
} else {
error('401');
}
}
} else {
await redirect(res, url, extra);
}
}
} else {
message.error("登录信息有误,请重新登录")
}
}else {
await redirect(res, url, extra);
}
// await fgetUserMsg(token).then(async res => {
// if (res) {
// if (res?.userType == null) {
// error('401');
// } else {
// if (res?.authorityList == null || res?.authorityList?.length == 0) {
// if (url == 'ExamineAndApprove/Announcement' ||
// url == 'ExamineAndApprove/ChangeTheAnnouncement' ||
// url == 'ExamineAndApprove/Publicity' ||
// url == 'ExamineAndApprove/InvitationLetter' ||
// url == 'ExamineAndApprove/ExternalReference' ||
// url == 'ExamineAndApprove/FailureAnnouncement') {
// let newAuthority: any[] = []
// newAuthority.push({
// authorities: [null, "system:user:test", "system:user:test", "system:user:test", "system:user:test", null, null],
// roleCode: "ebtp-unicom-default",
// roleId: "20004",
// roleName: "联通普通用户",
// roleScope: "EBTP"
// })
// res.authorityList = [...newAuthority];
// await redirect(res, url, extra);
// } else {
// if (status == 0) {
// await refreshUserData(res?.userType, token, url, extra);
// } else {
// error('401');
// }
// }
// } else {
// await redirect(res, url, extra);
// }
// }
// } else {
// message.error("登录信息有误,请重新登录")
// }
// })
})
}
//通过code取token
async function getToken(code: string, data: any) {

View File

@ -6,7 +6,7 @@ import request from '@/utils/request';
* @returns
*/
export async function fgetUserMsg(params: any) {
return request('/api/sys-manager-ebtp-project/v1/userinfo/get', {
return request('/api/v1/userinfo/get', {
method: 'GET',
headers: { 'Authorization': params },
data: params,