From d0850c1c55c5f709874cde1b5f292813fbd3af5e Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期三, 20 十一月 2024 12:12:59 +0800
Subject: [PATCH] 修改了bug
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
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 0a246d1..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
@@ -62,6 +62,9 @@
@Resource
private ZfEquipDownloadService zfEquipDownloadService;
+ @Resource
+ private MemoBookService memoBookService;
+
private LambdaQueryWrapper<ZfEquipment> buildCondition(ZfEquipment zfEquipment,List<Long> familyIdList) {
LambdaQueryWrapper<ZfEquipment> lqw = new LambdaQueryWrapper<>();
lqw.orderByDesc(ZfEquipment::getCreateTime);
@@ -592,6 +595,10 @@
if (!familyIdList.contains(data.getFamilyId())){
throw new RuntimeException("浣犳病鏈夋潈闄愭搷浣滄瀹跺涵鐨勬暟鎹�");
}
+
+ List<MemoBook> memoBookService1 = memoBookService.selectByIdAFid(data.getId(),2017L);
+ if (memoBookService1.size() != 0 && !memoBookService.removeByIds(memoBookService1))
+ return AjaxResult.error();
}
List<ZfEquipment> zfEquipments = listByIds(Arrays.asList(ids));
--
Gitblit v1.9.1