Merge branch 'develop-rc' into develop

TEAMModelOS/ClientApp/src/view/ability/Review.vue

@@ -202,7 +202,7 @@ export default {
         if (this.hasModify) {
           this.$Modal.confirm({
             title: '温馨提示',
-            content: '您存在未提交保存的修改内容，是否确认离开？',
+              content: '您未确认“提交评审结果”，无法保存修改内容，是否确认离开？',
             onOk: () => {
               this.$emit('goBack', {
                 needRefresh: needFresh

TEAMModelOS/ClientApp/src/view/jyzx/application.vue

@@ -480,11 +480,13 @@ export default {
       if(this.isReview && reviewRef.hasModify){
         this.$Modal.confirm({
 					title: '温馨提示',
-					content: '您存在未提交保存的修改内容，是否确认离开？',
+                    content: '您未确认“提交评审结果”，无法保存修改内容，是否确认离开？',
 					onOk: () => {
 						next();
 					}
 				});
+      }else{
+        next();
       }
 	}
 }

TEAMModelOS/ClientApp/src/view/trainList/Check.vue

@@ -175,7 +175,7 @@
 				return new Promise((resolve) => {
 					this.$Modal.confirm({
 						title: this.$t('syllabus.modifyTip'),
-						content: `确认修改当前教师的教研组长身份吗？`,
+						content: `确认修改当前教师的审核人员身份吗？`,
 						onOk: () => {
 							resolve();
 						}
@@ -193,7 +193,7 @@
 					mode: "multi"
 				}).then(res => {
 					if (!res.error) {
-						this.$Message.success(isAdd ? `已添加 ${val.name} 为教研组长` : `已取消 ${val.name} 的教研组长身份！`)
+						this.$Message.success(isAdd ? `已添加 ${val.name} 为审核人员` : `已取消 ${val.name} 的审核人员身份！`)
 					}
 				})
 			},

TEAMModelOS/Controllers/School/SchoolController.cs

@@ -1654,7 +1654,7 @@ namespace TEAMModelOS.Controllers
                                 }
                                 else
                                 {
-                                    tch = teacherImport.teachers.Find(t => t.id.Equals(x.id));
+                                    tch = teacherImport.teachers.Find(t =>  !string.IsNullOrWhiteSpace(x.id) &&  t.id.Equals(x.id));
                                 }
                                 if (tch != null)
                                 {