From 578e1df3a3c32bc0027de169ff6beea8f1527048 Mon Sep 17 00:00:00 2001
From: Jinquan_Ou <Jinquan@gdut.com>
Date: 星期四, 23 三月 2023 18:51:09 +0800
Subject: [PATCH] 完成个人信息、家庭大事记
---
zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
index 3628078..36dbe29 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
@@ -4,7 +4,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.MapUtils;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.domain.ZfEvent;
import com.ruoyi.domain.ZfProperty;
import com.ruoyi.mapper.ZfPropertyMapper;
import com.ruoyi.service.IZfPropertyService;
@@ -51,25 +53,18 @@
}
@Override
- public AjaxResult selectUserList(ZfProperty zfProperty,Integer pageNum,Integer pageSize) {
+ public AjaxResult selectPropertyList(ZfProperty zfProperty,Integer pageNum,Integer pageSize) {
LambdaQueryWrapper<ZfProperty> lqw = buildCondition(zfProperty);
Page<ZfProperty> zfPropertyPage = new Page<>(pageNum,pageSize);
Page<ZfProperty> pageResult = page(zfPropertyPage, lqw);
-
- HashMap<String, Object> data = new HashMap<>();
-
- data.put("data",pageResult.getRecords());
- data.put("total",pageResult.getTotal());
- data.put("pageNum",pageResult.getCurrent());
- data.put("pageSize",pageResult.getSize());
-
-
+ HashMap<String, Object> data = MapUtils.getResult(pageResult);
return AjaxResult.success(data);
}
+
}
--
Gitblit v1.9.1