From db08cc3405c6a5d1765fdfea5d35cf4e92c6718b Mon Sep 17 00:00:00 2001
From: wyt <414651037@qq.com>
Date: Mon, 22 Dec 2025 16:54:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/controller/SheepFileController.java  | 44 +++++++++++--------
 1 file changed, 26 insertions(+), 18 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 8450d42..b7e207f 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
@@ -1,5 +1,6 @@
 package com.zhyc.module.base.controller;
 
+import com.github.pagehelper.PageHelper;
 import com.zhyc.common.annotation.Log;
 import com.zhyc.common.core.controller.BaseController;
 import com.zhyc.common.core.domain.AjaxResult;
@@ -35,27 +36,34 @@ public class SheepFileController extends BaseController
      * 查询羊只档案列表
      */
     @PreAuthorize("@ss.hasPermi('sheep_file:sheep_file:list')")
-    @PostMapping("/list")  // 改为 POST 请求
+    @PostMapping("/list")
     public TableDataInfo list(@RequestBody(required = false) Map<String, Object> queryParams, HttpServletRequest request)
     {
-
-        // 1. 将分页参数设置到 HttpServletRequest 中（关键步骤）
-        if (queryParams != null && !queryParams.isEmpty()) {
-            // 提取分页参数并设置到 request 属性中
-            if (queryParams.containsKey("pageNum")) {
-                request.setAttribute("pageNum", queryParams.get("pageNum"));
-            }
-            if (queryParams.containsKey("pageSize")) {
-                request.setAttribute("pageSize", queryParams.get("pageSize"));
-            }
-        }
-
-
         // 解析查询参数
         SheepFile sheepFile = new SheepFile();
         Map<String, Object> customParams = new HashMap<>();
 
+        // 提取分页参数
+        Integer pageNum = 1;
+        Integer pageSize = 10;
+
         if (queryParams != null && !queryParams.isEmpty()) {
+            // 提取分页参数
+            if (queryParams.containsKey("pageNum") && queryParams.get("pageNum") != null) {
+                try {
+                    pageNum = Integer.parseInt(queryParams.get("pageNum").toString());
+                } catch (NumberFormatException e) {
+                    // 使用默认值
+                }
+            }
+            if (queryParams.containsKey("pageSize") && queryParams.get("pageSize") != null) {
+                try {
+                    pageSize = Integer.parseInt(queryParams.get("pageSize").toString());
+                } catch (NumberFormatException e) {
+                    // 使用默认值
+                }
+            }
+
             // 提取常规查询参数到 SheepFile 对象
             if (queryParams.containsKey("bsManageTags") && queryParams.get("bsManageTags") != null) {
                 sheepFile.setBsManageTags(queryParams.get("bsManageTags").toString());
@@ -83,12 +91,11 @@ public class SheepFileController extends BaseController
             }
 
             // 移除已经处理的参数，剩下的作为自定义筛选参数
-            // 注意：不直接修改原参数，而是复制到新Map中
             for (Map.Entry<String, Object> entry : queryParams.entrySet()) {
                 String key = entry.getKey();
                 Object value = entry.getValue();
 
-                // 跳过常规参数
+                // 跳过常规参数和分页参数
                 if ("bsManageTags".equals(key) || "electronicTags".equals(key) ||
                         "drRanch".equals(key) || "variety".equals(key) ||
                         "name".equals(key) || "gender".equals(key) ||
@@ -104,13 +111,14 @@ public class SheepFileController extends BaseController
             }
         }
 
-        startPage(); // 分页处理
+        // 使用自定义分页参数
+        PageHelper.startPage(pageNum, pageSize);
 
         // 调用支持复杂查询的Service方法
         List<SheepFile> list = sheepFileService.selectSheepFileListByCondition(customParams, sheepFile);
+
         return getDataTable(list);
     }
-
     /**
      * 转换对象为Long类型
      */