From 176a924f0881e0b2a4cadb9c0274842bc708a39f Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 20 四月 2025 21:31:54 +0800
Subject: [PATCH] 修改了接口
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfFamilyServiceImpl.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfFamilyServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfFamilyServiceImpl.java
index 0ef749d..c3815c2 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfFamilyServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfFamilyServiceImpl.java
@@ -2,13 +2,16 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+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.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.MapUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.domain.ZInfoUser;
import com.ruoyi.domain.ZfEvent;
import com.ruoyi.domain.ZfFamily;
+import com.ruoyi.domain.ZfProperty;
import com.ruoyi.domain.dto.UserInfoDto;
import com.ruoyi.mapper.ZfEventMapper;
import com.ruoyi.mapper.ZfFamilyMapper;
@@ -21,6 +24,7 @@
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;
@@ -41,6 +45,23 @@
ZfFamilyService zfFamilyService;
@Override
+ public AjaxResult selectDataList(ZfFamily zfFamily, Integer pageNum, Integer pageSize) {
+
+
+ LambdaQueryWrapper<ZfFamily> lqw = new LambdaQueryWrapper<>();
+
+ lqw.eq(zfFamily.getClanId()!=null,ZfFamily::getClanId,zfFamily.getClanId());
+ lqw.like(zfFamily.getName()!=null,ZfFamily::getName,zfFamily.getName());
+ Page<ZfFamily> zfPropertyPage = new Page<>(pageNum, pageSize);
+ Page<ZfFamily> pageResult = page(zfPropertyPage, lqw);
+
+ List<ZfFamily> beanRecords = pageResult.getRecords();//寰楀埌鏌ヨ鍑烘潵鐨勬暟鎹�
+ HashMap<String, Object> data = MapUtils.getResult(pageResult, beanRecords);
+
+ return AjaxResult.success(data);
+ }
+
+ @Override
public ZfFamily getByNameAndUser(ZfFamily zfFamily) {
LambdaQueryWrapper<ZfFamily> lqw = new LambdaQueryWrapper<>();
lqw.eq(ZfFamily::getName,zfFamily.getName()).or().eq(ZfFamily::getFid, zfFamily.getFid());
@@ -48,9 +69,10 @@
}
@Override
- public ZfFamily getByName(String familyName) {
+ public ZfFamily getByName(String familyName, Integer clanId) {
LambdaQueryWrapper<ZfFamily> lqw = new LambdaQueryWrapper<>();
lqw.eq(ZfFamily::getName,familyName);
+ lqw.eq(ZfFamily::getClanId, clanId);
return getOne(lqw);
}
--
Gitblit v1.9.1