From 227402da809c41d33fe206f7a5e88a08e17c18f6 Mon Sep 17 00:00:00 2001 From: zqy <252236926@qq.com> Date: 星期二, 20 五月 2025 18:25:02 +0800 Subject: [PATCH] 修改家庭收支台账 宠物问题 --- zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java index 7d61d5b..61a4168 100644 --- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java +++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java @@ -63,6 +63,12 @@ @Resource RestHighLevelClient restHighLevelClient; + @Resource + ZfCollectionShareService zfCollectionShareService; + + @Resource + ZfCollectionDownloadService zfCollectionDownloadService; + private LambdaQueryWrapper<ZfCollection> buildCondition(ZfCollection zfCollection,List<Long> familyIdList) { LambdaQueryWrapper<ZfCollection> lqw = new LambdaQueryWrapper<>(); lqw.orderByDesc(ZfCollection::getCreateTime); @@ -233,7 +239,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(); @@ -322,7 +328,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(); @@ -579,7 +585,9 @@ } List<ZfCollection> zfCollections = listByIds(Arrays.asList(ids)); - + if (! ( zfCollectionDownloadService.deleteData(ids) && zfCollectionShareService.deleteByContentId(ids) ) ){ + return AjaxResult.error(); + } if (zfCollectionService.removeByIds(Arrays.asList(ids))) { //鍒犻櫎es涓殑鏁版嵁 -- Gitblit v1.9.1