From da1f13fac6dda0b4168d70bc9f7d68b03b1cc117 Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期二, 16 五月 2023 03:40:28 +0800
Subject: [PATCH] 1.修改了网站名以及在首页加上了备案号 2.各模块删除时不显示数据序号 3.各模块删除单条数据时不会再同时打开详情页 4.各模块新增重复数据可被检测并且提示不要输入重复数据 5.家根网页面更换了第三代的大图 6.收藏与荣誉模块显示和新增统一为“持有者”
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZfPropertyController.java | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 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 2710cf2..1afcf61 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
@@ -6,7 +6,9 @@
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.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.PageParams;
import com.ruoyi.domain.ZfProperty;
@@ -17,6 +19,9 @@
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;
+
+import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
+import static com.ruoyi.common.core.page.TableSupport.PAGE_SIZE;
/**
* @Version 1.0
@@ -31,18 +36,10 @@
private IZfPropertyService zfPropertyService;
@GetMapping("/all")
- 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;
+ public AjaxResult listAll(@RequestBody ZfProperty zfProperty){
+ Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
+ Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
+ return zfPropertyService.selectUserList(zfProperty,pageNum,pageSize);
}
// /**
--
Gitblit v1.9.1