diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java index 2a9b699d..51954af4 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java @@ -177,14 +177,16 @@ public class PmFormDataServiceImpl extends ServiceImpl parents = pmFormDataDtos.stream().map(PmFormDataDto::getId).collect(Collectors.toList()); List childs = this.baseMapper.selectChilds(parents); - Map> childMap = childs.stream().collect(Collectors.groupingBy(PmFormDataDto::getParent_id)); - for (PmFormDataDto dataDto : pmFormDataDtos) { - List children = childMap.get(dataDto.getId()); - for (PmFormDataDto child : children) { - String productArea = child.getForm_data().getString("product_area"); - child.setProduct_area(productArea); + if (!CollectionUtils.isEmpty(childs)){ + Map> childMap = childs.stream().collect(Collectors.groupingBy(PmFormDataDto::getParent_id)); + for (PmFormDataDto dataDto : pmFormDataDtos) { + List children = childMap.get(dataDto.getId()); + for (PmFormDataDto child : children) { + String productArea = child.getForm_data().getString("product_area"); + child.setProduct_area(productArea); + } + dataDto.setChildren(children); } - dataDto.setChildren(children); } } com.baomidou.mybatisplus.extension.plugins.pagination.Page dtoPage = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(page.getPages(), page.getPageSize(), page.getTotal());