From e126ec9be7a8f8d2c351f2843a9a184d1bcc8703 Mon Sep 17 00:00:00 2001
From: zqy <252236926@qq.com>
Date: 星期五, 30 五月 2025 16:48:52 +0800
Subject: [PATCH] 修改用户

---
 zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetServiceImpl.java |   19 ++++++++++++++++++-
 1 files changed, 18 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 fe2ba31..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
@@ -49,6 +49,16 @@
     
     @Resource
     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);
@@ -73,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();
@@ -265,6 +275,13 @@
             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();
         }
 
         if (zfPetService.removeByIds(Arrays.asList(ids))) {

--
Gitblit v1.9.1