diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..656f68c Binary files /dev/null and b/dist.zip differ diff --git a/src/components/topBar/index.jsx b/src/components/topBar/index.jsx index baec137..586772a 100644 --- a/src/components/topBar/index.jsx +++ b/src/components/topBar/index.jsx @@ -305,16 +305,38 @@ export class TopBar extends React.Component { - + {this.state.requestData.fclass == '0' && ( + + + + {' '} + + )} - - + diff --git a/src/pages/company.jsx b/src/pages/company.jsx index 100a459..fe00cdf 100644 --- a/src/pages/company.jsx +++ b/src/pages/company.jsx @@ -76,9 +76,10 @@ export default function companyPage() { '/api/bs/hrmorganization/orgchart/asyncCompanyData' + qs.stringify(request, { addQueryPrefix: true }); } else { + let request = { ...topbar.state.requestData, ids: idsStr }; api = - '/api/bs/hrmorganization/orgchart/asyncCompanyData?fclass=0&fisvitual=0&id=0&root=0&ids=' + - idsStr; + '/api/bs/hrmorganization/orgchart/asyncCompanyData' + + qs.stringify(request, { addQueryPrefix: true }); } fetch(api) .then((res) => res.json()) diff --git a/src/pages/user.jsx b/src/pages/user.jsx index 6958422..1433caa 100644 --- a/src/pages/user.jsx +++ b/src/pages/user.jsx @@ -99,7 +99,7 @@ export default function userPage() { // 获取数据 useEffect(() => { document.cookie = - 'ecology_JSessionid=aaaIt6Y2NuzAQ98Ci0Jaz; Systemlanguid=7; JSESSIONID=aaaIt6Y2NuzAQ98Ci0Jaz; loginidweaver=sysadmin; loginuuids=1; languageidweaver=8; __randcode__=486bc6ba-9c04-47fc-a977-f7c55bab42e9'; + 'ecology_JSessionid=aaa5JLqrHUV6R9P1cmTbz; JSESSIONID=aaa5JLqrHUV6R9P1cmTbz; loginuuids=1; languageidweaver=7; Systemlanguid=7; loginidweaver=sysadmin; __randcode__=72a0b641-7599-4301-a47f-61620f350ec5'; d3.json( '/api/bs/hrmorganization/orgchart/userData?fclass=0&fisvitual=0&root=0&level=3&id=0', ).then((data) => {