Merge branch 'master' of http://scjoyedu.eicp.net:9121/front-team/webPublic

zyd_public/components/ImportUtil2.0/index.js

@@ -345,7 +345,11 @@ export default class ImportUtil extends React.PureComponent {
 	exportData = (isPass) => {
 		const type = isPass ? 'passList' : 'noPassList';
 		const { filekey, exportTemplateUrl } = this.state;
-		window.open(`${exportTemplateUrl}&cacheKey=${filekey}&dataType=${type}&token=${getToken()}`);
+		let splitCode = '?';
+		if(exportTemplateUrl && exportTemplateUrl.indexOf('?') > -1){
+		  splitCode = '&';
+    }
+		window.open(`${exportTemplateUrl}${splitCode}cacheKey=${filekey}&dataType=${type}&token=${getToken()}`);
 	};
 
 	continueImport = () => {