diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/CsStatisticalSetPOServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/CsStatisticalSetPOServiceImpl.java index 607db070a..1cb4c617b 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/CsStatisticalSetPOServiceImpl.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/CsStatisticalSetPOServiceImpl.java @@ -18,10 +18,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; import java.util.stream.Collectors; /** @@ -69,6 +66,7 @@ public class CsStatisticalSetPOServiceImpl extends MppServiceImpl dictTreeVOS = sysDicTreePOService.queryByPid(id); List collect; if (!CollectionUtils.isEmpty(dictTreeVOS)) { + dictTreeVOS = dictTreeVOS.stream().sorted(Comparator.comparing(DictTreeVO::getSort)).collect(Collectors.toList()); List collect3 = dictTreeVOS.stream().map(DictTreeVO::getId).collect(Collectors.toList()); collect3.add(id); QueryWrapper queryWrap = new QueryWrapper<>();