From a70919b4f7baab856125f36e5bd41f5ee81be680 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期二, 13 五月 2025 09:41:35 +0800
Subject: [PATCH] 修改年份切换字段不为必填

---
 src/main/java/com/cl/controller/InstitutionController.java |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/cl/controller/InstitutionController.java b/src/main/java/com/cl/controller/InstitutionController.java
index 04444b5..a183e3b 100644
--- a/src/main/java/com/cl/controller/InstitutionController.java
+++ b/src/main/java/com/cl/controller/InstitutionController.java
@@ -4,7 +4,9 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cl.common.result.Result;
 import com.cl.pojo.dto.AddInstitutionDTO;
+import com.cl.pojo.dto.DataPageDTO;
 import com.cl.pojo.dto.EditInstitutionDTO;
+import com.cl.pojo.dto.InstitutionPageDTO;
 import com.cl.pojo.entity.Institution;
 import com.cl.pojo.vo.InstitutionVO;
 import com.cl.service.InstitutionService;
@@ -40,14 +42,11 @@
     /**
      * 分页
      */
-    @GetMapping("/pageList")
+    @PostMapping("/pageList")
     @ApiOperation("机构分页")
-    public Result<IPage<InstitutionVO> > pageList(@RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
-                                   @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
-                                   @RequestParam(value = "county",required = false)Integer county,//0-查所有
-                                   @RequestParam(value = "name",required = false)String name) {
-        IPage<Institution> page = new Page<>(pageNum, pageSize);
-        return Result.success(institutionService.pageList(page,county,name));
+    public Result<IPage<InstitutionVO> > pageList(@RequestBody @Valid InstitutionPageDTO dataPageDTO) {
+        IPage<Institution> page = new Page<>(dataPageDTO.getPageNum(), dataPageDTO.getPageSize());
+        return Result.success(institutionService.pageList(page,dataPageDTO.getCountyList(),dataPageDTO.getName()));
     }
     /**
      * 编辑回显

--
Gitblit v1.7.1