From c24698dacd5d43d99bbae35b430a189675a6532b Mon Sep 17 00:00:00 2001 From: feige <791364011@qq.com> Date: 星期二, 06 五月 2025 17:08:48 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java | 9 ++++++++- 1 files changed, 8 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 0a246d1..ae031a8 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,9 +62,12 @@ @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); + lqw.orderByDesc(ZfEquipment::getHappenTime); lqw.like(StringUtils.isNotEmpty(zfEquipment.getName()), ZfEquipment::getName, zfEquipment.getName()); lqw.like(StringUtils.isNotEmpty(zfEquipment.getBuyer()), ZfEquipment::getBuyer, zfEquipment.getBuyer()); lqw.like(StringUtils.isNotEmpty(zfEquipment.getContent()), ZfEquipment::getContent, zfEquipment.getContent()); @@ -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