From bd6d42818da5b2551eba1884744f28a42720987d Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 24 十二月 2024 10:28:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwContractServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwContractServiceImpl.java b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwContractServiceImpl.java
index a8592aa..65e21a8 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwContractServiceImpl.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwContractServiceImpl.java
@@ -67,8 +67,10 @@
@Override
public MwContractVO detail(Long id) {
MwContractVO mwContractVO = BeanUtils.copyBean(getById(id), MwContractVO.class);
- List<MwAttachment> list = mwAttachmentService.lambdaQuery().eq(MwAttachment::getType, AttachmentTypeEnum.CONTRACT.getCode()).eq(MwAttachment::getTargetId, id).list();
- mwContractVO.setAttachmentList(BeanUtils.copyToList(list, MwAttachmentVO.class));
+ if (Objects.nonNull(mwContractVO)) {
+ List<MwAttachment> list = mwAttachmentService.lambdaQuery().eq(MwAttachment::getType, AttachmentTypeEnum.CONTRACT.getCode()).eq(MwAttachment::getTargetId, id).list();
+ mwContractVO.setAttachmentList(BeanUtils.copyToList(list, MwAttachmentVO.class));
+ }
return mwContractVO;
}
--
Gitblit v1.7.1