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/ZfPetServiceImpl.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetServiceImpl.java
index f36cac4..3242f33 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetServiceImpl.java
@@ -83,7 +83,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();
@@ -275,7 +275,9 @@
             if (!familyIdList.contains(data.getFamilyId())){
                 throw new RuntimeException("浣犳病鏈夋潈闄愭搷浣滄瀹跺涵鐨勬暟鎹�");
             }
-            if (!zfPetNoteService.removeBatchByIds(zfPetNoteService.getPetNoteByPetId(data.getId())))
+            List<ZfPetNote> petNoteByPetId = zfPetNoteService.getPetNoteByPetId(data.getId());
+            if(petNoteByPetId.size() != 0)
+            if (!zfPetNoteService.removeBatchByIds(petNoteByPetId))
                 return AjaxResult.error();
         }
         if (! (zfPetDownlService.deleteData(ids) && zfPetSharService.deleteByContentId(ids)  ) ){

--
Gitblit v1.9.1