diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/controller/SheepFileController.java b/zhyc-module/src/main/java/com/zhyc/module/base/controller/SheepFileController.java
index 41be2d4..6391bc2 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/base/controller/SheepFileController.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/base/controller/SheepFileController.java
@@ -59,13 +59,29 @@ public class SheepFileController extends BaseController
} catch (NumberFormatException e) {
// 使用默认值
}
+ } else if (queryParams.containsKey("page") && queryParams.get("page") != null) {
+ // 如果 pageNum 不存在,则尝试使用 page
+ try {
+ pageNum = Integer.parseInt(queryParams.get("page").toString());
+ } catch (NumberFormatException e) {
+ // 使用默认值
+ }
}
+
+
if (queryParams.containsKey("pageSize") && queryParams.get("pageSize") != null) {
try {
pageSize = Integer.parseInt(queryParams.get("pageSize").toString());
} catch (NumberFormatException e) {
// 使用默认值
}
+ }else if (queryParams.containsKey("limit") && queryParams.get("limit") != null) {
+ // 如果 pageSize 不存在,则尝试使用 limit
+ try {
+ pageSize = Integer.parseInt(queryParams.get("limit").toString());
+ } catch (NumberFormatException e) {
+ // 使用默认值
+ }
}
// 提取常规查询参数到 SheepFile 对象
diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/mapper/SheepFileSqlProvider.java b/zhyc-module/src/main/java/com/zhyc/module/base/mapper/SheepFileSqlProvider.java
index b6b1a2b..106a227 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/base/mapper/SheepFileSqlProvider.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/base/mapper/SheepFileSqlProvider.java
@@ -33,7 +33,7 @@ public class SheepFileSqlProvider {
// 添加动态条件
addDynamicConditions(sql, conditions);
- sql.ORDER_BY("id DESC");
+ sql.ORDER_BY("id ASC");
return sql.toString();
}
diff --git a/zhyc-module/src/main/resources/mapper/base/SheepFileMapper.xml b/zhyc-module/src/main/resources/mapper/base/SheepFileMapper.xml
index 2479840..1d6964c 100644
--- a/zhyc-module/src/main/resources/mapper/base/SheepFileMapper.xml
+++ b/zhyc-module/src/main/resources/mapper/base/SheepFileMapper.xml
@@ -90,6 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and status_id = #{statusId}
and breed = #{breed}
+ ORDER BY id ASC