diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/panel/PanelShopServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/panel/PanelShopServiceImpl.java index bdb4f68a6..494ed2402 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/panel/PanelShopServiceImpl.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/panel/PanelShopServiceImpl.java @@ -62,7 +62,9 @@ public class PanelShopServiceImpl implements PanelShopService { List list = hardOrderMapper.groupByMch(dto); for (PanelPorductVo.ProductTypeItemVo v : result) { List targetMchTotalList = list.stream().filter(item -> ObjectUtil.equals(v.getType(), String.valueOf(item.getMchId()))).toList(); - if (ObjectUtil.isEmpty(targetMchTotalList)) continue; + if (ObjectUtil.isEmpty(targetMchTotalList)) { + targetMchTotalList = new ArrayList<>(); + } // 处理时间 List resultList = BeanUtil.copyToList(dateList, PanelPorductVo.class); for (PanelPorductVo i : resultList) {