From 35924055a41e1505aceacef503fd3cfa7a064a36 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 26 八月 2025 20:24:03 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfFamilyServiceImpl.java | 9 ++++++++-
1 files changed, 8 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 30d1aab..8f28484 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
@@ -69,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);
}
@@ -87,6 +88,12 @@
lqw.eq(ZfFamily::getId,fid);
return getOne(lqw);
}
+ @Override
+ public List<ZfFamily> getByClanId(Long clanId){
+ LambdaQueryWrapper<ZfFamily> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(ZfFamily::getClanId,clanId);
+ return list(lqw);
+ }
@Override
public List<UserInfoDto> getByFamilyId(Long fid) {
--
Gitblit v1.9.1