Merge branch 'develop' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop

TEAMModelOS/ClientApp/src/view/auth/Product.vue

@@ -304,7 +304,7 @@ export default {
           image: require("@/assets/image/module8.png"),
           content: '提供综合性的评价服务，跟踪学生的五育（德、智、体、美、劳）发展，以便学校领导，教师清晰地了解学生在不同领域全面发展情况。',
           isPay: 0,
-          prodCode: 'LSZYJ6NA',
+          prodCode:'YPXSJ6NJ',
           'zh-cn': '',
           'zh-tw': '',
           'en-us': '',

TEAMModelOS/ClientApp/src/view/homepage/RcdPoster.vue

@@ -22,16 +22,16 @@ export default {
       let local = localStorage.getItem('local')
       switch (local) {
         case 'zh-cn':
-          img.src = require('@/assets/image/no-poster-cn.png')
+          img.src = require('@/assets/image/no-poster-cn1.png')
           break
         case 'zh-tw':
-          img.src = require('@/assets/image/no-poster-tw.png')
+          img.src = require('@/assets/image/no-poster-tw1.png')
           break
         case 'en':
-          img.src = require('@/assets/image/no-poster-en.png')
+          img.src = require('@/assets/image/no-poster-en1.png')
           break
         default:
-          img.src = require('@/assets/image/no-poster-en.png')
+          img.src = require('@/assets/image/no-poster-en1.png')
           break
       }
 

TEAMModelOS/ClientApp/src/view/mycourse/MyCourse.vue

@@ -1616,7 +1616,9 @@
 						this.assistantStatus = true
 					})
 				} else {
-					this.searchIn('', assistants)
+					if(assistants.length) {
+						this.searchIn('', assistants)
+					}
 					this.assistantStatus = true
 				}
 			},
@@ -1680,14 +1682,14 @@
 			deleteList(index) {
 				this.assistantsList.splice(index, 1)
 			},
-            /* 设置协同教师 */
-            assistantChange(val) {
-				let length = val.length + this.assistantsList.length
-                if(length > 3) {
-                    this.$Message.warning(this.$t('newCusMgt.tip3'))
-                    this.sltTeachers = this.sltTeachers.slice(0, 3 - this.assistantsList.length)
-                }
-            },
+			/* 设置协同教师 */
+			assistantChange(val) {
+					let length = val.length + this.assistantsList.length
+			if(length > 3) {
+				this.$Message.warning(this.$t('newCusMgt.tip3'))
+				this.sltTeachers = this.sltTeachers.slice(0, 3 - this.assistantsList.length)
+			}
+			},
 			searchIn(value, assistants) {
 				this.searchIdErrorMsg = '';
 				if (this.keyword || assistants) {

TEAMModelOS/ClientApp/src/view/teachermgmt/components/mgt/TeacherMgt.vue

@@ -686,7 +686,7 @@ export default {
         filterData = filterData.filter(item => item.groups && !!item.groups.find(g => g.name === this.filters.group))
       }
       //权限筛选
-      if (this.filters.auth && this.filters.status != 0) {
+      if (this.filters.auth) {
         if (this.filters.auth == 1) {
           filterData = filterData.filter(item => item.roles?.includes('admin'))
         } else if (this.filters.auth == 2) {

TEAMModelOS/Controllers/XTest/DataMigrationController.cs

@@ -317,7 +317,7 @@ namespace TEAMModelOS.Controllers
                 List<Course> schoolCourses = new List<Course>();
                 HashSet<string> schoolIds = new HashSet<string>();
                 string sql = "select value c from c where c.pk='Course' ";
-                await foreach (var item in _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.School).GetItemQueryIterator<Course>(queryText: sql, requestOptions: new QueryRequestOptions { PartitionKey=new PartitionKey("Course-xcsyxx") }))
+                await foreach (var item in _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.School).GetItemQueryIterator<Course>(queryText: sql))
                 {
 
                     if (!string.IsNullOrWhiteSpace(item.school))