diff --git a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetTableFieldManage.java b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetTableFieldManage.java index 9c54cdba9b..813b5a2c6a 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetTableFieldManage.java +++ b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetTableFieldManage.java @@ -189,9 +189,7 @@ public class DatasetTableFieldManage { public DatasetTableFieldDTO selectById(Long id) { CoreDatasetTableField coreDatasetTableField = coreDatasetTableFieldMapper.selectById(id); if (coreDatasetTableField == null) return null; - DatasetTableFieldDTO dto = new DatasetTableFieldDTO(); - BeanUtils.copyBean(dto, coreDatasetTableField); - return dto; + return transObj(coreDatasetTableField); } /** @@ -282,30 +280,31 @@ public class DatasetTableFieldManage { return tmp; } + public DatasetTableFieldDTO transObj(CoreDatasetTableField ele) { + DatasetTableFieldDTO dto = new DatasetTableFieldDTO(); + if (ele == null) return null; + BeanUtils.copyBean(dto, ele); + if (StringUtils.isNotEmpty(ele.getParams())) { + TypeReference> tokenType = new TypeReference<>() { + }; + List calParams = JsonUtil.parseList(ele.getParams(), tokenType); + dto.setParams(calParams); + } + if (StringUtils.isNotEmpty(ele.getGroupList())) { + TypeReference> groupTokenType = new TypeReference<>() { + }; + List fieldGroups = JsonUtil.parseList(ele.getGroupList(), groupTokenType); + dto.setGroupList(fieldGroups); + } + return dto; + } + public List transDTO(List list) { if (!CollectionUtils.isEmpty(list)) { - return list.stream().map(ele -> { - DatasetTableFieldDTO dto = new DatasetTableFieldDTO(); - if (ele == null) return null; - BeanUtils.copyBean(dto, ele); - if (StringUtils.isNotEmpty(ele.getParams())) { - TypeReference> tokenType = new TypeReference<>() { - }; - List calParams = JsonUtil.parseList(ele.getParams(), tokenType); - dto.setParams(calParams); - } - if (StringUtils.isNotEmpty(ele.getGroupList())) { - TypeReference> groupTokenType = new TypeReference<>() { - }; - List fieldGroups = JsonUtil.parseList(ele.getGroupList(), groupTokenType); - dto.setGroupList(fieldGroups); - } - return dto; - }).collect(Collectors.toList()); + return list.stream().map(this::transObj).collect(Collectors.toList()); } else { return new ArrayList<>(); } - } private CoreDatasetTableField transDTO2Record(DatasetTableFieldDTO dto) {