manage : queryCommonDictTree 修复空指针

dev_2.1.0
xueqingkun 1 year ago
parent bcae983acd
commit 240fcb1dcb

@ -11,11 +11,7 @@ import com.supervision.service.CommonDicService;
import com.supervision.mapper.CommonDicMapper; import com.supervision.mapper.CommonDicMapper;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList; import java.util.*;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@ -37,7 +33,7 @@ public class CommonDicServiceImpl extends ServiceImpl<CommonDicMapper, CommonDic
.map(node -> BeanUtil.toBean(node, CommonDictTreeDTO.class)).collect(Collectors.toList()); .map(node -> BeanUtil.toBean(node, CommonDictTreeDTO.class)).collect(Collectors.toList());
// 递归构建树 // 递归构建树
recursionBuildTree(commonDicParentIdMap, topList); recursionBuildTree(commonDicParentIdMap, topList);
topList.sort(Comparator.comparingInt(CommonDic::getPriority)); topList.sort(Comparator.comparingInt(v1 -> Objects.isNull(v1.getPriority()) ? 999 : v1.getPriority()));
return topList; return topList;
} }

Loading…
Cancel
Save