diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index b9c60d72..09a8dfc5 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -269,6 +269,10 @@ public class LawsCommonServiceImpl implements ILawsCommonService { Map resultMap = new LinkedHashMap<>(); String id = (String) initMap.get("id"); String standardNumber = (String) initMap.get(FieldCommon.STANDARD_NUMBER); + if (StringUtils.isBlank(standardNumber)) { + ManyStandardSelectionBox singleStandard = getSingleStandard(null, id); + standardNumber = singleStandard.getStandardNumber(); + } for (Map.Entry entryMap : initMap.entrySet()) { String key = entryMap.getKey(); String value = ""; @@ -389,6 +393,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { List dictIdList = dictTag.stream().map(LawsTag::getDictId).collect(Collectors.toList()); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.in(SysDictItem::getDictId, dictIdList); + queryWrapper.orderByDesc(SysDictItem::getId); dictItemList = sysDictItemService.list(queryWrapper); } return dictItemList; @@ -707,6 +712,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { List valueList = Arrays.asList(value.split(",")); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.in(OSSFile::getId, valueList); + queryWrapper.orderByDesc(OSSFile::getId); List fileList = ossFileService.list(queryWrapper); value = StringUtils.join(fileList.stream() .map(OSSFile::getFileName).collect(Collectors.toList()), ","); @@ -718,6 +724,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { List valueList = Arrays.asList(value.split(",")); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.in(LawsTreeNode::getId, valueList); + queryWrapper.orderByDesc(LawsTreeNode::getId); List nodeList = lawsTreeNodeService.list(queryWrapper); value = StringUtils.join(nodeList.stream() .map(LawsTreeNode::getNodeName).collect(Collectors.toList()), ","); @@ -736,6 +743,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(SysDictItem::getDictId, lawsTag.getDictId()); queryWrapper.in(SysDictItem::getItemValue, valueList); + queryWrapper.orderByDesc(SysDictItem::getId); List dictList = sysDictItemService.list(queryWrapper); value = StringUtils.join(dictList.stream() .map(SysDictItem::getItemText).collect(Collectors.toList()), ",");