diff --git a/modules/module-system-biz/src/main/java/cd/casic/module/system/service/dict/DictDataServiceImpl.java b/modules/module-system-biz/src/main/java/cd/casic/module/system/service/dict/DictDataServiceImpl.java index 5e74a188..3c31097a 100644 --- a/modules/module-system-biz/src/main/java/cd/casic/module/system/service/dict/DictDataServiceImpl.java +++ b/modules/module-system-biz/src/main/java/cd/casic/module/system/service/dict/DictDataServiceImpl.java @@ -1,5 +1,6 @@ package cd.casic.module.system.service.dict; +import cd.casic.framework.commons.util.collection.CollectionUtils; import cd.casic.module.system.controller.admin.dict.vo.data.DictDataRespVO; import cd.casic.module.system.controller.admin.dict.vo.data.DictDataTreeVO; import cd.casic.module.system.convert.dict.DictDataConvert; @@ -7,7 +8,6 @@ import cd.casic.module.system.convert.dict.DictTypeConvert; import cn.hutool.core.collection.CollUtil; import cd.casic.framework.commons.enums.CommonStatusEnum; import cd.casic.framework.commons.pojo.PageResult; -import cd.casic.framework.commons.util.collection.CollectionUtils; import cd.casic.framework.commons.util.object.BeanUtils; import cd.casic.module.system.controller.admin.dict.vo.data.DictDataPageReqVO; import cd.casic.module.system.controller.admin.dict.vo.data.DictDataSaveReqVO; @@ -192,7 +192,9 @@ public class DictDataServiceImpl implements DictDataService { if (CollUtil.isEmpty(list)) { return dataTree; } - + if (org.springframework.util.CollectionUtils.isEmpty(list)) { + return new ArrayList<>(); + } Map> map = list.stream().collect(Collectors.groupingBy(DictDataRespVO::getDictType)); for (DictDataTreeVO treeVO : dataTree) { treeVO.setChildren(map.get(treeVO.getType()));