From ccd693a914802ab29632af4db35838512149bacc Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 22 四月 2025 20:58:44 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetServiceImpl.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 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..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
@@ -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);
@@ -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