From 72f21494ba48e573e68007eab2296f8c25ecc4b7 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 05 十一月 2024 10:07:12 +0800
Subject: [PATCH] 修改了bug
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 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 efac001..0a246d1 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
@@ -56,6 +56,12 @@
@Resource
private RestHighLevelClient restHighLevelClient;
+ @Resource
+ private ZfEquipShareService zfEquipShareService;
+
+ @Resource
+ private ZfEquipDownloadService zfEquipDownloadService;
+
private LambdaQueryWrapper<ZfEquipment> buildCondition(ZfEquipment zfEquipment,List<Long> familyIdList) {
LambdaQueryWrapper<ZfEquipment> lqw = new LambdaQueryWrapper<>();
lqw.orderByDesc(ZfEquipment::getCreateTime);
@@ -307,7 +313,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();
List<Long> idList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(EQUIPMENT_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());
@@ -589,6 +595,9 @@
}
List<ZfEquipment> zfEquipments = listByIds(Arrays.asList(ids));
+ if (! (zfEquipDownloadService.deleteData(ids) && zfEquipShareService.deleteByContentId(ids) ) ){
+ return AjaxResult.error();
+ }
if (zfEquipmentService.removeByIds(Arrays.asList(ids))) {
@@ -604,6 +613,7 @@
}
}
});
+
return AjaxResult.success();
}else {
return AjaxResult.error();
--
Gitblit v1.9.1