From fbfde8292c1ab06ccd943ef4c7acfe3c0e4101a1 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 15 四月 2025 19:42:56 +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 | 3 ++-
1 files changed, 2 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..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
@@ -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);
}
--
Gitblit v1.9.1