修复分页问题

baqing-admin/src/main/java/com/ruoyi/web/modules/diagnosis/controller/BizMedicalResourceController.java

@@ -19,6 +19,8 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.web.modules.diagnosis.domain.BizMedicalResource;
 import com.ruoyi.web.modules.diagnosis.service.IBizMedicalResourceService;
+import com.ruoyi.web.modules.diagnosis.support.MedicalResourceTypeValidator;
+import com.ruoyi.web.modules.diagnosis.support.MedicalResourceValidation;
 
 /**
  * 畜牧医疗资源管理
@@ -30,6 +32,9 @@ public class BizMedicalResourceController extends BaseController
     @Autowired
     private IBizMedicalResourceService bizMedicalResourceService;
 
+    @Autowired
+    private MedicalResourceTypeValidator medicalResourceTypeValidator;
+
     @PreAuthorize("@ss.hasPermi('diseaseTreatment:medicalResource:list')")
     @GetMapping("/list")
     public TableDataInfo list(BizMedicalResource query,
@@ -40,6 +45,9 @@ public class BizMedicalResourceController extends BaseController
             query.setQueryPublishStatus(listPublishStatus);
             query.setPublishStatus(null);
         }
+        // 须在 startPage 之前完成校验：assertAllowed 会查库，否则 PageHelper 分页会落在类别查询上
+        MedicalResourceValidation.validateListQuery(query);
+        medicalResourceTypeValidator.assertAllowed(query.getResourceType());
         startPage();
         List<BizMedicalResource> list = bizMedicalResourceService.selectBizMedicalResourceList(query);
         return getDataTable(list);

baqing-admin/src/main/java/com/ruoyi/web/modules/diagnosis/service/impl/BizMedicalResourceServiceImpl.java

@@ -53,8 +53,7 @@ public class BizMedicalResourceServiceImpl implements IBizMedicalResourceService
     @Override
     public List<BizMedicalResource> selectBizMedicalResourceList(BizMedicalResource query)
     {
-        MedicalResourceValidation.validateListQuery(query);
-        medicalResourceTypeValidator.assertAllowed(query.getResourceType());
+        // 列表入参校验与类型校验须在 Controller 中、startPage() 之前完成（避免 PageHelper 分页错位）
         List<BizMedicalResource> list = bizMedicalResourceMapper.selectBizMedicalResourceList(query);
         if (list != null)
         {

baqing-admin/src/main/java/com/ruoyi/web/modules/diagnosis/support/MedicalResourceTypeValidator.java

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

baqing-admin/src/test/java/com/ruoyi/web/modules/diagnosis/controller/BizMedicalResourceControllerApiTest.java

@@ -39,6 +39,7 @@ import com.ruoyi.web.modules.diagnosis.MedicalResourceTestSamples;
 import com.ruoyi.web.modules.diagnosis.domain.BizMedicalResource;
 import com.ruoyi.web.modules.diagnosis.service.IBizMedicalResourceService;
 import com.ruoyi.web.modules.diagnosis.support.MedicalResourceRules;
+import com.ruoyi.web.modules.diagnosis.support.MedicalResourceTypeValidator;
 
 @ExtendWith(MockitoExtension.class)
 @MockitoSettings(strictness = Strictness.LENIENT)
@@ -52,6 +53,9 @@ class BizMedicalResourceControllerApiTest
     @Mock
     private IBizMedicalResourceService bizMedicalResourceService;
 
+    @Mock
+    private MedicalResourceTypeValidator medicalResourceTypeValidator;
+
     @InjectMocks
     private BizMedicalResourceController controller;
 
@@ -100,7 +104,9 @@ class BizMedicalResourceControllerApiTest
         mockMvc.perform(get("/diseaseTreatment/medicalResource/list")
                 .param("resourceType", MedicalResourceRules.RESOURCE_TYPE_VET)
                 .param("resourceName", "张")
-                .param("publishStatus", "0"))
+                .param("publishStatus", "0")
+                .param("pageNum", "1")
+                .param("pageSize", "20"))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$.code").value(200));
     }