修复分页问题

baqing-admin/src/main/java/com/ruoyi/web/modules/farming/controller/BizTechResourceController.java

@@ -19,6 +19,8 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.web.modules.farming.domain.BizTechResource;
 import com.ruoyi.web.modules.farming.service.IBizTechResourceService;
+import com.ruoyi.web.modules.farming.support.TechResourceTypeValidator;
+import com.ruoyi.web.modules.farming.support.TechResourceValidation;
 
 /**
  * 畜牧科技资源管理
@@ -30,6 +32,9 @@ public class BizTechResourceController extends BaseController
     @Autowired
     private IBizTechResourceService bizTechResourceService;
 
+    @Autowired
+    private TechResourceTypeValidator techResourceTypeValidator;
+
     @PreAuthorize("@ss.hasPermi('techService:techResource:list')")
     @GetMapping("/list")
     public TableDataInfo list(BizTechResource query,
@@ -40,6 +45,9 @@ public class BizTechResourceController extends BaseController
             query.setQueryPublishStatus(listPublishStatus);
             query.setPublishStatus(null);
         }
+        // 须在 startPage 之前完成校验：assertAllowed 会查库，否则 PageHelper 分页会落在类别查询上
+        TechResourceValidation.validateListQuery(query);
+        techResourceTypeValidator.assertAllowed(query.getResourceType());
         startPage();
         List<BizTechResource> list = bizTechResourceService.selectBizTechResourceList(query);
         return getDataTable(list);

baqing-admin/src/main/java/com/ruoyi/web/modules/farming/service/impl/BizTechResourceServiceImpl.java

@@ -57,8 +57,7 @@ public class BizTechResourceServiceImpl implements IBizTechResourceService
     @Override
     public List<BizTechResource> selectBizTechResourceList(BizTechResource query)
     {
-        TechResourceValidation.validateListQuery(query);
-        techResourceTypeValidator.assertAllowed(query.getResourceType());
+        // 列表入参校验与类型校验须在 Controller 中、startPage() 之前完成（避免 PageHelper 分页错位）
         List<BizTechResource> list = bizTechResourceMapper.selectBizTechResourceList(query);
         if (list != null)
         {

baqing-admin/src/main/java/com/ruoyi/web/modules/farming/support/TechResourceTypeValidator.java

@@ -9,6 +9,8 @@ import com.ruoyi.web.modules.category.service.IBizInformationCategoryService;
 
 /**
  * 畜牧科技资源类型须为资讯类别下级（parentCode=004, categoryType=7）。
+ * <p>
+ * 分页列表须在 {@code startPage()} 之前调用 {@link #assertAllowed(String)}，否则 PageHelper 会分页到类别查询而非主列表。
  */
 @Component
 public class TechResourceTypeValidator

baqing-admin/src/test/java/com/ruoyi/web/modules/farming/controller/BizTechResourceControllerApiTest.java

@@ -39,6 +39,7 @@ import com.ruoyi.web.modules.farming.TechResourceTestSamples;
 import com.ruoyi.web.modules.farming.domain.BizTechResource;
 import com.ruoyi.web.modules.farming.service.IBizTechResourceService;
 import com.ruoyi.web.modules.farming.support.TechResourceRules;
+import com.ruoyi.web.modules.farming.support.TechResourceTypeValidator;
 
 @ExtendWith(MockitoExtension.class)
 @MockitoSettings(strictness = Strictness.LENIENT)
@@ -52,6 +53,9 @@ class BizTechResourceControllerApiTest
     @Mock
     private IBizTechResourceService bizTechResourceService;
 
+    @Mock
+    private TechResourceTypeValidator techResourceTypeValidator;
+
     @InjectMocks
     private BizTechResourceController controller;
 
@@ -98,7 +102,9 @@ class BizTechResourceControllerApiTest
         mockMvc.perform(get("/techService/techResource/list")
                 .param("resourceType", TechResourceRules.RESOURCE_TYPE_EXPERT)
                 .param("resourceName", "张")
-                .param("publishStatus", "0"))
+                .param("publishStatus", "0")
+                .param("pageNum", "1")
+                .param("pageSize", "20"))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$.code").value(200));
     }