diff --git a/backend/src/main/java/com/yfd/platform/common/GroupHelper.java b/backend/src/main/java/com/yfd/platform/common/GroupHelper.java index aaf612b5..6b707ee9 100644 --- a/backend/src/main/java/com/yfd/platform/common/GroupHelper.java +++ b/backend/src/main/java/com/yfd/platform/common/GroupHelper.java @@ -92,7 +92,10 @@ public class GroupHelper { for(Map item : data) { Object groupKey = this.getKey(item, groupInfo); - Object groupIndexKey = groupKey != null ? groupKey : null; + if (groupKey == null) { + continue; + } + Object groupIndexKey = groupKey; Object tempCount = item.get("count_" + groupInfo.getSelector()); if (tempCount == null) { tempCount = item.get("COUNT_" + groupInfo.getSelector().toUpperCase()); diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java index 7e34245e..1418a713 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java @@ -170,7 +170,7 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl powerDtos = msAlongDetBMapper.getWbsbList(stcd); if (CollUtil.isNotEmpty(powerDtos)) { // 取第一个结果(通常一个 STCD 只对应一条记录) - String stnm = powerDtos.get(0).getStnm(); + String stnm = powerDtos.getFirst().getStnm(); record.setStnm(stnm); } } @@ -154,7 +154,7 @@ public class MsAlongDetBServiceImpl extends ServiceImpl