Merge remote-tracking branch 'origin/main' into main

backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/impl/ZYJXJHBServiceImpl.java

@@ -77,7 +77,7 @@ public class ZYJXJHBServiceImpl implements ZYJXJHBService {
         if (ty != null) {
             wrapper.eq(ZYJXJHB::getTy, ty);
         }
-        wrapper.orderByAsc(ZYJXJHB::getZydh);
+        wrapper.orderByDesc(ZYJXJHB::getQysj).orderByAsc(ZYJXJHB::getZydh);
         Page<ZYJXJHB> result = zyjxjhbMapper.selectPage(page, wrapper);
         return new PageResult<>(result.getRecords(), result.getTotal(),
                 query.getPageNum(), query.getPageSize());

frontend/src/views/teachBusiness/syllabus/index.vue

@@ -406,11 +406,19 @@ export default {
     /* ---------- 列表加载 ---------- */
     fetchList() {
       this.loading = true
-      listByZydhAndTy({ zydh: this.searchForm.zydh, ty: this.searchForm.ty }).then(response => {
+      this.localPaging = false
-        const data = response.data || []
+      const query = {
+        pageNum: this.pageNum,
+        pageSize: this.pageSize,
+        ty: this.searchForm.ty
+      }
+      if (this.searchForm.zydh) {
+        query.zydh = this.searchForm.zydh
+      }
+      listByZydhAndTy(query).then(response => {
+        const data = response.data || {}
         this.tableData = Array.isArray(data) ? data : (data.records || [])
-        this.total = this.tableData.length
+        this.total = Array.isArray(data) ? data.length : Number(data.total || 0)
-        this.localPaging = true
       }).catch(() => {
         this.tableData = []
         this.total = 0
@@ -458,6 +466,9 @@ export default {
         req.then(() => {
           this.$message.success(isEdit ? '修改成功' : '新增成功')
           this.dialog.visible = false
+          if (!isEdit) {
+            this.pageNum = 1
+          }
           this.fetchList()
         }).finally(() => {
           this.dialog.submitting = false
@@ -517,15 +528,11 @@ export default {
     handleSizeChange(size) {
       this.pageSize = size
       this.pageNum = 1
-      if (!this.localPaging) {
       this.fetchList()
-      }
     },
     handlePageChange(page) {
       this.pageNum = page
-      if (!this.localPaging) {
       this.fetchList()
-      }
     },
 
     /* ---------- 工具 ---------- */