From 5e2ebcceae4bc34b46370f2c10110cd72e7f4fba Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期四, 22 八月 2024 10:59:29 +0800
Subject: [PATCH] 修改权限相关

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfFamilyController.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfFamilyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfFamilyController.java
index 6cae23e..5e766e5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfFamilyController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfFamilyController.java
@@ -2,7 +2,9 @@
 
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.domain.ZfEvent;
 import com.ruoyi.domain.ZfFamily;
@@ -14,6 +16,9 @@
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+
+import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
+import static com.ruoyi.common.core.page.TableSupport.PAGE_SIZE;
 
 /**
  * @Author Jinquan_Ou
@@ -29,8 +34,10 @@
     ZfFamilyService zfFamilyService;
 
     @GetMapping("/all")
-    public AjaxResult getAllFamily(){
-        return AjaxResult.success(zfFamilyService.list());
+    public AjaxResult getAllFamily(ZfFamily zfFamily){
+        Integer pageNo = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
+        Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
+        return zfFamilyService.selectDataList(zfFamily, pageNo,pageSize);
     }
 
     /**

--
Gitblit v1.9.1