From 38bf6d26c02f2861abdbe95b8e2a1312e6f30202 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期一, 04 十一月 2024 18:04:48 +0800
Subject: [PATCH] 删除宠物将对应的备忘本一并删除
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java | 21 ++++++++++++++++++++-
1 files changed, 20 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 65d18d4..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);
@@ -229,6 +235,10 @@
//鍔犱笂鑷繁瀹跺涵鐨刬d
idList.add(familyId);
+ //鍔犱笂鐖舵瘝瀹舵棌id
+ idList.add(fatherFaId);
+ idList.add(motherFaId);
+
LambdaQueryWrapper<ZfEquipment> lambdaQueryWrapper = buildCondition(zfEquipment, idList);
List<ZfEquipment> beanRecords = list(lambdaQueryWrapper);
log.info("浠庢暟鎹簱涓煡鍒扮殑涓�:{}", beanRecords);
@@ -303,12 +313,17 @@
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());
//鍔犱笂鑷繁瀹跺涵鐨刬d
idList.add(familyId);
+
+ //鍔犱笂鐖舵瘝瀹舵棌id
+ idList.add(fatherFaId);
+ idList.add(motherFaId);
+
// String familyIds = listFamilyIds();
// String secondFamilyAuthority = listSecondFamilyIds();
LambdaQueryWrapper<ZfEquipment> lqw = buildCondition(zfEquipment, idList);
@@ -580,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))) {
@@ -595,6 +613,7 @@
}
}
});
+
return AjaxResult.success();
}else {
return AjaxResult.error();
--
Gitblit v1.9.1