Merge branch 'develop6.0-tmd' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop6.0-tmd

TEAMModelOS/ClientApp/src/view/evaluation/index/CreatePaper.vue

@@ -832,6 +832,12 @@
 			async justSaveItems() {
 				let list = this._.cloneDeep(this.evaluationInfo.item)
 				console.log('仅保存试题！！！！');
+				let exListVm = this.$refs.testPaper.$refs.exList
+				let hasErrorItem = exListVm.errorList.length > 0
+				if (hasErrorItem) {
+					this.$Message.warning(this.$t('evaluation.paperList.hasErrorItemTip'))
+					return
+				}
 				if (list.length) {
 					let refreshList = await this.refreshImportItems(list)
 					console.log(refreshList);

TEAMModelOS/Controllers/Third/Sc/ScController.cs

@@ -476,6 +476,10 @@ namespace TEAMModelOS.Controllers
             if (!string.IsNullOrWhiteSpace(_option.HostName)) {
                 HostName = _option.HostName;
             }
+            if (path.Equals("jinniu"))
+            {
+                HostName = "jinniu.teammodel.cn";
+            }
             //var rurl = new StringBuilder($"https://{_option.HostName}/sso");
             var rurl = new StringBuilder($"https://{HostName}/sso");
             try