From 630f681bc0077d5e933d00fb252f01cc4f5128b8 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 08 十二月 2024 09:03:01 +0800
Subject: [PATCH] 修改了日志相关内容

---
 zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetServiceImpl.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 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 df53fa7..a25b70e 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
@@ -51,10 +51,14 @@
     ZAuthorityService zAuthorityService;
 
     @Resource
+    ZfPetNoteService zfPetNoteService;
+
+    @Resource
     ZfPetSharService zfPetSharService;
 
     @Resource
     ZfPetDownlService zfPetDownlService;
+
     @Override
     public AjaxResult selectDataList(ZfPet zfPet, Integer pageNum, Integer pageSize) {
 //        LambdaQueryWrapper<ZfPet> lqw = buildCondition(zfPet);
@@ -79,7 +83,7 @@
             fatherFaId = zInfoUserService.getInfoById(myself.getFatherId()).getFamilyId();
         Long motherFaId = 0L;
         if(myself.getMomId()!=null)
-            motherFaId = zInfoUserService.getInfoById(myself.getMomId()).getFamilyId();
+            motherFaId = zInfoUserService.getInfoBysysId(myself.getMomId()).getFamilyId();
 
         //涔熻鏌ュ埆浜烘巿鏉冪殑
         List<ZAuthority> authority = zAuthorityService.getAuthority();
@@ -271,6 +275,10 @@
             if (!familyIdList.contains(data.getFamilyId())){
                 throw new RuntimeException("浣犳病鏈夋潈闄愭搷浣滄瀹跺涵鐨勬暟鎹�");
             }
+            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)  ) ){
             return AjaxResult.error();

--
Gitblit v1.9.1