From 6c746ec2d71de4f14af773c867c71fe55b32f49f Mon Sep 17 00:00:00 2001
From: Jinquan_Ou <Jinquan@gdut.com>
Date: 星期四, 16 三月 2023 21:31:45 +0800
Subject: [PATCH] 第一次提交

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZfPropertyController.java |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZfPropertyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZfPropertyController.java
index 1fada30..2710cf2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZfPropertyController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZfPropertyController.java
@@ -1,11 +1,14 @@
 package com.ruoyi.web.controller.system;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.domain.PageParams;
 import com.ruoyi.domain.ZfProperty;
 import com.ruoyi.service.IZfPropertyService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,10 +31,18 @@
     private IZfPropertyService zfPropertyService;
 
     @GetMapping("/all")
-    public TableDataInfo  listAll(){
-        startPage();
-        List<ZfProperty> list = zfPropertyService.list();
-        return getDataTable(list);
+    public AjaxResult  listAll(PageParams pageParams){
+
+        Page<ZfProperty> page = new Page<ZfProperty>(pageParams.getPageNum(),pageParams.getPageSize());
+        Page<ZfProperty> pageResult = zfPropertyService.page(page);
+        AjaxResult success = AjaxResult.success();
+        success.put("msg","鎿嶄綔鎴愬姛");
+        success.put("code",200);
+        success.put("data",pageResult.getRecords());
+        success.put("total",pageResult.getTotal());
+        success.put("pageNum",pageResult.getCurrent());
+        success.put("pageSize",pageResult.getSize());
+        return success;
     }
 
 //    /**

--
Gitblit v1.9.1