Merge branch 'master' of http://git.qmth.com.cn/ExamCloud-3/examcloud-web-admin

src/modules/basic/view/course.vue

@@ -750,15 +750,23 @@ export default {
       var url =
         CORE_API +
         "/specialty/specialtyPage/" +
-        (this.currentPage - 1) +
+        (this.currentSpecialtyPage - 1) +
         "/" +
         this.pageSize +
         "?" +
         param;
-      this.$httpWithMsg.get(url).then(response => {
-        this.specialtyTableData = response.data.content;
-        this.specialtyTotal = response.data.totalElements;
-      });
+      this.$httpWithMsg
+        .get(url)
+        .then(response => {
+          this.specialtyTableData = response.data.content;
+          this.specialtyTotal = response.data.totalElements;
+        })
+        .then(() => {
+          if (this.specialtyTableData.length === 0 && this.specialtyTotal > 0) {
+            this.currentSpecialtyPage = this.currentSpecialtyPage - 1;
+            this.searchSpecialtyPage();
+          }
+        });
     },
     getTag(status) {
       if (status == true) {

src/modules/basic/view/specially.vue

@@ -585,16 +585,24 @@ export default {
       var url =
         CORE_API +
         "/course/coursePage/" +
-        (this.currentPage - 1) +
+        (this.currentCoursePage - 1) +
         "/" +
         this.pageSize +
         "?" +
         param;
-      this.$httpWithMsg.get(url).then(response => {
-        console.log(response);
-        this.courseTableData = response.data.content;
-        this.courseTotal = response.data.totalElements;
-      });
+      this.$httpWithMsg
+        .get(url)
+        .then(response => {
+          console.log(response);
+          this.courseTableData = response.data.content;
+          this.courseTotal = response.data.totalElements;
+        })
+        .then(() => {
+          if (this.courseTableData.length === 0 && this.courseTotal > 0) {
+            this.currentCoursePage = this.currentCoursePage - 1;
+            this.searchCoursePage();
+          }
+        });
     },
     getCourses(query) {
       this.courseLoading = true;