From e46e4f942ce486fe75f8c5aabf01c1adb566db9f Mon Sep 17 00:00:00 2001 From: liulujian Date: Fri, 12 Jun 2026 00:15:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../txw/gxzx/service/impl/TxwGxzxShqkbServiceImpl.java | 8 +++++++- .../txw/mhzc/service/impl/TxwGxzxShqkbServiceImpl.java | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/txw-gxzx/txw-gxzx-service-biz/src/main/java/com/css/txw/gxzx/service/impl/TxwGxzxShqkbServiceImpl.java b/txw-gxzx/txw-gxzx-service-biz/src/main/java/com/css/txw/gxzx/service/impl/TxwGxzxShqkbServiceImpl.java index 790f456..8877bf7 100644 --- a/txw-gxzx/txw-gxzx-service-biz/src/main/java/com/css/txw/gxzx/service/impl/TxwGxzxShqkbServiceImpl.java +++ b/txw-gxzx/txw-gxzx-service-biz/src/main/java/com/css/txw/gxzx/service/impl/TxwGxzxShqkbServiceImpl.java @@ -14,6 +14,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.*; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -137,7 +138,12 @@ public class TxwGxzxShqkbServiceImpl extends ServiceImpl getQyuuidsByBq(GxxxReqVO reqVO) { List list = gxxxbMapper.getQyuuidsByFwlxjh(reqVO.getFwlxjh()); if (GyUtils.isNull(list)) return null; - return list.stream().map(TxwGxzxGxxxbDO::getQyuuid).distinct().collect(Collectors.toList()); + return list.stream() + .filter(Objects::nonNull) + .map(TxwGxzxGxxxbDO::getQyuuid) + .filter(Objects::nonNull) + .distinct() + .collect(Collectors.toList()); } @Override diff --git a/txw-mhzc/txw-mhzc-service-biz/src/main/java/com/css/txw/mhzc/service/impl/TxwGxzxShqkbServiceImpl.java b/txw-mhzc/txw-mhzc-service-biz/src/main/java/com/css/txw/mhzc/service/impl/TxwGxzxShqkbServiceImpl.java index 9947b51..4de5274 100644 --- a/txw-mhzc/txw-mhzc-service-biz/src/main/java/com/css/txw/mhzc/service/impl/TxwGxzxShqkbServiceImpl.java +++ b/txw-mhzc/txw-mhzc-service-biz/src/main/java/com/css/txw/mhzc/service/impl/TxwGxzxShqkbServiceImpl.java @@ -14,6 +14,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.*; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -137,7 +138,12 @@ public class TxwGxzxShqkbServiceImpl extends ServiceImpl getQyuuidsByBq(GxxxReqVO reqVO) { List list = gxxxbMapper.getQyuuidsByFwlxjh(reqVO.getFwlxjh()); if (GyUtils.isNull(list)) return null; - return list.stream().map(TxwGxzxGxxxbDO::getQyuuid).distinct().collect(Collectors.toList()); + return list.stream() + .filter(Objects::nonNull) + .map(TxwGxzxGxxxbDO::getQyuuid) + .filter(Objects::nonNull) + .distinct() + .collect(Collectors.toList()); } @Override