From 227402da809c41d33fe206f7a5e88a08e17c18f6 Mon Sep 17 00:00:00 2001
From: zqy <252236926@qq.com>
Date: 星期二, 20 五月 2025 18:25:02 +0800
Subject: [PATCH] 修改家庭收支台账 宠物问题

---
 zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java
index af831b6..7997802 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java
@@ -59,6 +59,12 @@
     @Resource
     RestHighLevelClient restHighLevelClient;
 
+    @Resource
+    ZfEconomyShaService zfEconomyShaService;
+
+    @Resource
+    ZfEconomyDownlService zfEconomyDownlService;
+
     private LambdaQueryWrapper<ZfEconomy> buildCondition(ZfEconomy zfEconomy,List<Long> familyIdList) {
         LambdaQueryWrapper<ZfEconomy> lqw = new LambdaQueryWrapper<>();
         lqw.orderByDesc(ZfEconomy::getCreateTime);
@@ -87,6 +93,11 @@
         lqw.eq(zfEconomy.getFamilyId()!=null,ZfEconomy::getFamilyId,zfEconomy.getFamilyId());
         lqw.eq(zfEconomy.getHappenTime() != null, ZfEconomy::getHappenTime, zfEconomy.getHappenTime());
         return lqw;
+    }
+    @Override
+    public List<ZfEconomy> change(){
+        ZfEconomy zfEconomy = new ZfEconomy();
+       return list(buildCondition(zfEconomy,null));
     }
 
 //    private LambdaQueryWrapper<ZfEconomy> buildCondition(ZfEconomy zfEconomy, String familyIds, String secondFamilyAuthority) {
@@ -230,7 +241,7 @@
             fatherFaId = zInfoUserService.getInfoById(myself.getFatherId()).getFamilyId();
         Long motherFaId = 0L;
         if(myself.getMomId()!=null)
-            motherFaId = zInfoUserService.getInfoBysysId(myself.getMomId()).getFamilyId();
+            motherFaId = zInfoUserService.getInfoById(myself.getMomId()).getFamilyId();
 
         //涔熻鏌ュ埆浜烘巿鏉冪殑
         List<ZAuthority> authority = zAuthorityService.getAuthority();
@@ -307,7 +318,7 @@
             fatherFaId = zInfoUserService.getInfoById(myself.getFatherId()).getFamilyId();
         Long motherFaId = 0L;
         if(myself.getMomId()!=null)
-            motherFaId = zInfoUserService.getInfoBysysId(myself.getMomId()).getFamilyId();
+            motherFaId = zInfoUserService.getInfoById(myself.getMomId()).getFamilyId();
 
         //涔熻鏌ュ埆浜烘巿鏉冪殑
         List<ZAuthority> authority = zAuthorityService.getAuthority();
@@ -549,7 +560,9 @@
             }
         }
         List<ZfEconomy> zfEconomys = listByIds(Arrays.asList(ids));
-
+        if (! (zfEconomyDownlService.deleteData(ids) && zfEconomyShaService.deleteByContentId(ids)  ) ){
+            return AjaxResult.error();
+        }
         if (zfEconomyService.removeByIds(Arrays.asList(ids))) {
 
             //鍒犻櫎es涓殑鏁版嵁

--
Gitblit v1.9.1