From 5d7b0a0bbcae6844e2296ef53c3f4c88293dacfe Mon Sep 17 00:00:00 2001
From: jinquanOu <1511349576@qq.com>
Date: 星期二, 11 六月 2024 18:18:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 zhang-content/src/main/java/com/ruoyi/service/impl/ZfFamilyServiceImpl.java |   53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 53 insertions(+), 0 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 d76aa4f..0ef749d 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
@@ -18,7 +18,9 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -33,11 +35,35 @@
     @Autowired
     ZInfoUserService zInfoUserService;
 
+    @Resource
+    ZfFamilyMapper zfFamilyMapper;
+    @Resource
+    ZfFamilyService zfFamilyService;
+
+    @Override
+    public ZfFamily getByNameAndUser(ZfFamily zfFamily) {
+        LambdaQueryWrapper<ZfFamily> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(ZfFamily::getName,zfFamily.getName()).or().eq(ZfFamily::getFid, zfFamily.getFid());
+        return getOne(lqw);
+    }
 
     @Override
     public ZfFamily getByName(String familyName) {
         LambdaQueryWrapper<ZfFamily> lqw = new LambdaQueryWrapper<>();
         lqw.eq(ZfFamily::getName,familyName);
+        return getOne(lqw);
+    }
+
+    @Override
+    public ZfFamily getByFid(Long fid) {
+        LambdaQueryWrapper<ZfFamily> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(ZfFamily::getFid,fid);
+        return getOne(lqw);    }
+
+    @Override
+    public ZfFamily getByFamId(Long fid) {
+        LambdaQueryWrapper<ZfFamily> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(ZfFamily::getId,fid);
         return getOne(lqw);
     }
 
@@ -114,4 +140,31 @@
         return AjaxResult.success();
 
     }
+
+    @Override
+    public AjaxResult addFamily(ZfFamily zfFamily) {
+        int res = zfFamilyMapper.insert(zfFamily);
+        return AjaxResult.success();
+    }
+
+    @Override
+    public AjaxResult updateFam(ZfFamily zfFamily) {
+        int res = zfFamilyMapper.updateById(zfFamily);
+
+        if(res!=0) {
+            return AjaxResult.success();
+        }else
+            return  AjaxResult.error("淇敼澶辫触,瀹跺涵鍙蜂笉鑳介噸澶�");
+    }
+
+    @Override
+    public AjaxResult deleteFam(Long[] ids) {
+        if (zfFamilyService.removeByIds(Arrays.asList(ids))) {
+            return AjaxResult.success();
+        }
+        else
+            return AjaxResult.error();
+
+
+    }
 }

--
Gitblit v1.9.1