Merge branch 'develop' of http://163.228.141.122:3000/TEAMMODEL/TEAMModelOS into develop

TEAMModelOS/ClientApp/src/components/coursemgt/StudentList.vue

@@ -289,17 +289,19 @@ export default {
                 if (data.results.length) {
                     this.excelFilter = data.results
                     excelResult = this._.cloneDeep(data.results)
-                    this.tableFilterData = stuData.filter(item => {
-                        let eIndex = excelResult.findIndex(results => results?.id && results?.id.toString() === item.id && results?.name === item.name)
-                        if(eIndex != -1) {
-                            excelResult.splice(eIndex, 1)
-                            return true
+                    this.tableFilterData = []
+                    this.notFoundlist = []
+                    excelResult.forEach(results => {
+                        let sData = stuData.find(item => results?.id && results?.id.toString() === item.id && results?.name === item.name)
+                        if(sData) {
+                            this.tableFilterData.push(sData)
+                        } else {
+                            this.notFoundlist.push(results)
                         }
                     })
                     this.pointNum = this.basicCount
                     this.tableShowData = this.tableFilterData.slice(0, this.basicCount)
                     
-                    this.notFoundlist = excelResult
                     this.$nextTick(() => {
                         this.$refs.stuSelection.selectAll(true);
                     });