From 9b2e78080fd730b87f6aa6fc2c3e89e2c0df5ad9 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 05 十一月 2024 21:28:02 +0800
Subject: [PATCH] 修改不能删除的bug
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZPropertyController.java | 2 +-
zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetServiceImpl.java | 4 +++-
zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java | 2 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSecretController.java | 2 +-
zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java | 2 +-
5 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZPropertyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZPropertyController.java
index bb80f76..d2a566d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZPropertyController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZPropertyController.java
@@ -152,7 +152,7 @@
{
for (Long id: ids) {
List<MemoBook> memoBookService1 = memoBookService.selectByIdAFid(id,2026L);
- if (!memoBookService.removeByIds(memoBookService1))
+ if (memoBookService1.size() != 0 && !memoBookService.removeByIds(memoBookService1))
return AjaxResult.error();
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSecretController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSecretController.java
index 9b965a2..0a5892f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSecretController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSecretController.java
@@ -151,7 +151,7 @@
{
for (Long id: ids) {
List<MemoBook> memoBookService1 = memoBookService.selectByIdAFid(id,2031L);
- if (!memoBookService.removeByIds(memoBookService1))
+ if (memoBookService1.size() != 0 && !memoBookService.removeByIds(memoBookService1))
return AjaxResult.error();
}
if (! (zSecretDownloadService.deleteData(ids) && zSecretShareService.deleteByContentId(ids) ) ){
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
index c4cfcf4..95b3e0f 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
@@ -566,7 +566,7 @@
throw new RuntimeException("浣犳病鏈夋潈闄愭搷浣滄瀹跺涵鐨勬暟鎹�");
}
List<MemoBook> memoBookService1 = memoBookService.selectByIdAFid(data.getId().longValue(),2007L);
- if (!memoBookService.removeByIds(memoBookService1))
+ if (memoBookService1.size() != 0 && !memoBookService.removeByIds(memoBookService1))
return AjaxResult.error();
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java
index 7adbf2e..e9e091f 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java
@@ -597,7 +597,7 @@
}
List<MemoBook> memoBookService1 = memoBookService.selectByIdAFid(data.getId(),2017L);
- if (!memoBookService.removeByIds(memoBookService1))
+ if (memoBookService1.size() != 0 && !memoBookService.removeByIds(memoBookService1))
return AjaxResult.error();
}
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..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
@@ -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