From b3d9a865dca2217d23c8ba9092717423a02b7cff Mon Sep 17 00:00:00 2001
From: wyt <414651037@qq.com>
Date: Mon, 12 Jan 2026 23:36:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BE=8A=E5=8F=AA=E6=A1=A3?=
 =?UTF-8?q?=E6=A1=88=E6=98=BE=E7=A4=BA=E6=8E=92=E5=BA=8F=EF=BC=8C=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E6=B5=8B=E8=AF=95=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/controller/SheepFileController.java     | 16 ++++++++++++++++
 .../module/base/mapper/SheepFileSqlProvider.java |  2 +-
 .../resources/mapper/base/SheepFileMapper.xml    |  3 ++-
 3 files changed, 19 insertions(+), 2 deletions(-)

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"
             <if test="statusId != null "> and status_id = #{statusId}</if>
             <if test="breed != null  and breed != ''"> and breed = #{breed}</if>
         </where>
+        ORDER BY id ASC  <!-- 修改为升序 -->
     </select>
     
     <select id="selectSheepFileById" parameterType="Long" resultMap="SheepFileResult">
@@ -260,7 +261,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 </foreach>
             </if>
         </where>
-        ORDER BY id DESC
+        ORDER BY id ASC
     </select>
 
 <!--    &lt;!&ndash; 查询所有公羊（gender=2） &ndash;&gt;-->