Merge branch 'main' of github.com:dataease/dataease into main

This commit is contained in:
taojinlong 2021-05-25 17:53:59 +08:00
commit cebbc87e6e

View File

@ -139,6 +139,7 @@ public class DataSetGroupService {
} }
public void getParent(List<DatasetGroup> list, DatasetGroup datasetGroup) { public void getParent(List<DatasetGroup> list, DatasetGroup datasetGroup) {
if (ObjectUtils.isNotEmpty(datasetGroup)) {
if (StringUtils.isNotEmpty(datasetGroup.getPid())) { if (StringUtils.isNotEmpty(datasetGroup.getPid())) {
DatasetGroup d = datasetGroupMapper.selectByPrimaryKey(datasetGroup.getPid()); DatasetGroup d = datasetGroupMapper.selectByPrimaryKey(datasetGroup.getPid());
list.add(d); list.add(d);
@ -146,3 +147,4 @@ public class DataSetGroupService {
} }
} }
} }
}