From ef94dcd00f6a2fda846bc99fb9fac5cdb05b3906 Mon Sep 17 00:00:00 2001
From: jl-zhoujl2 <jl-zhoujl2@chinaunicom.cn>
Date: Wed, 24 Aug 2022 11:17:18 +0800
Subject: [PATCH] =?UTF-8?q?8.24=20=E4=B8=93=E5=AE=B6=E5=BA=93=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=ACS=E7=B1=BB=E5=9E=8B=E5=8F=82=E6=95=B0=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/BasicLayout.tsx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/layouts/BasicLayout.tsx b/src/layouts/BasicLayout.tsx
index 78ab70c..544785f 100644
--- a/src/layouts/BasicLayout.tsx
+++ b/src/layouts/BasicLayout.tsx
@@ -12,7 +12,7 @@ import { ConnectState } from '@/models/connect';
 import { getMatchMenu } from '@umijs/route-utils';
 import { getMenu } from './services'
 import logo from '../assets/logo.svg';
-import { getSessionRoleData } from '@/utils/session';
+import { getSessionRoleData, getSessionUserData } from '@/utils/session';
 
 import {
   HomeOutlined,
@@ -140,6 +140,8 @@ const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
   const [menuData, setMenuData] = React.useState<any>();
   const [menuShow, setmenuShow] = React.useState<any>(false);
   const menuDataRef = useRef<MenuDataItem[]>([]);
+  const mall3_token: any = sessionStorage.getItem('Authorization');//当前登录token
+  const userData: any = getSessionUserData();//当前登录人信息
   useEffect(() => {
     if (getSessionRoleData()?.roleId) {
       let params = {
@@ -206,7 +208,9 @@ const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
       } else if (menuItemProps.frame && menuItemProps.frame == 'Y') {
         return <Link onClick={() => window.open(menuItemProps.path)} to="#">{defaultDom}</Link>;
       } else if (menuItemProps.frame && menuItemProps.frame == 'S') {
-        return <Link onClick={() => window.open(menuItemProps.path + '&mall3_token=' + sessionStorage.getItem('Authorization'))} to="#">{defaultDom}</Link>;
+        const initPath = menuItemProps.path;
+        const rePath = initPath?.replace("{mall3_token}", mall3_token).replace("{loginName}", userData.loginName).replace("{organizationId}", userData.organizationId);
+        return <Link onClick={() => window.open(rePath)} to="#">{defaultDom}</Link>;
       } else {
         return <Link to={menuItemProps.path}>{defaultDom}</Link>;
       }