Merge remote-tracking branch 'origin/master'

one_stop_public/2023yunshangguizhou/utils.js

@@ -16,7 +16,7 @@ export function isJSON(str) {
 }
 
 export const getSysCode = () => {
-	return getYunShangGuiZhouSyStemConfig().sysCode;
+	return window.specialImportantSystemConfig.sysCode || getYunShangGuiZhouSyStemConfig().sysCode;
 };
 
 // 查询系统配置
@@ -41,15 +41,15 @@ export const getYunShangGuiZhouSyStemConfig = () => {
 
 export const getSassApiHeader = () => {
 	// 解决禅道 34246 在学工、素质测评、宿管、离校的所有接口中增加请求头
-  if(!getSysCode()){
+  if(!getSysCode() && !window.specialImportantSystemConfig.sysCode){
     return {
       Authorization: `bearer ${getToken()}`,
     };
   }else{
     return {
       Authorization: `bearer ${getToken()}`,
-      sysCode: getSysCode(),
-      tenant: getUserInfo().tenantCode || null,
+      sysCode: window.specialImportantSystemConfig.sysCode || getSysCode(),
+      tenant: window.specialImportantSystemConfig.tenant || getUserInfo().tenantCode || null,
     };
   }
 };

one_stop_public/utils/token.js

@@ -47,11 +47,15 @@ export const getUserInfo = () => {
       x.groupsId = 'pub';
       x.differenceBetweenServerAndClientTime = 0;
     }
+    if(!x.tenantCode){
+      x.tenantCode = window.specialImportantSystemConfig.tenant || undefined;
+    }
     return x;
   } else {
     return {
       groupsId: 'pub',
       differenceBetweenServerAndClientTime: 0,
+      tenantCode: window.specialImportantSystemConfig.tenant || undefined,
     };
   }
 };