From 9d31915e99fcd5e5fc3b9453eb570fc2358e0179 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 14 一月 2025 16:48:30 +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