From 25df39b6e03b781e2ceff9601851189f195b6633 Mon Sep 17 00:00:00 2001 From: hongchao <3228015117@qq.com> Date: Tue, 14 Oct 2025 22:52:50 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E7=AE=97=E5=B7=A5=E7=A8=8B=E9=99=90?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../clz/service/impl/ClzSltAgreementInfoServiceImpl.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/ClzSltAgreementInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/ClzSltAgreementInfoServiceImpl.java index 075de9e8..a53e32cf 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/ClzSltAgreementInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/ClzSltAgreementInfoServiceImpl.java @@ -133,6 +133,15 @@ public class ClzSltAgreementInfoServiceImpl implements ClzSltAgreementInfoServic if (proId == null || !unsettledProjectIds.contains(proId)) { iterator.remove(); + continue; + } + // 根据工程去机具协议表查询关联协议数据 + List agreementIdList = mapper.getAgreementId(info.getProId()); + // 根据工程去材料站协议表查询关联协议数据 + List storageAgreementIdList = mapper.getStorageAgreementId(info.getProId()); + // 如果获取的协议数据为空，则移除该行数据 + if (com.alibaba.nacos.common.utils.CollectionUtils.isEmpty(agreementIdList) && com.alibaba.nacos.common.utils.CollectionUtils.isEmpty(storageAgreementIdList)) { + iterator.remove(); } } }