From 8a2b8b8335a64f60ca4cc425aa22e321237044f1 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Tue, 23 Jul 2024 15:10:14 +0800 Subject: [PATCH] =?UTF-8?q?fix(87268):=20=E6=96=87=E6=A1=A3=E6=8B=86?= =?UTF-8?q?=E5=88=86--=E6=A0=87=E5=87=86=E6=8B=86=E5=88=86=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=9D=A1=E6=AC=BE=E5=86=85=E5=AE=B9=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E5=90=8E=E5=88=A0=E9=99=A4=EF=BC=8C=E9=87=8D=E6=96=B0=E6=8B=86?= =?UTF-8?q?=E5=88=86=E4=B8=8D=E4=BF=AE=E6=94=B9=E5=8F=91=E5=B8=83=EF=BC=8C?= =?UTF-8?q?=E5=A4=96=E6=9D=A5=E6=A0=87=E5=87=86=E6=98=BE=E7=A4=BA=E7=9A=84?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=88=86=E8=A7=A3=E5=8D=95=E6=9C=AA=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../laws/common/service/impl/LawsCommonServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 8687f1ea..5f223bc0 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 @@ -285,10 +285,15 @@ public class LawsCommonServiceImpl implements ILawsCommonService { queryWrapper.isNotNull(SarFileSplitInfoEO::getPublishBeforeId); // 文件字段标识 queryWrapper.isNotNull(SarFileSplitInfoEO::getFileType); + queryWrapper.orderByDesc(SarFileSplitInfoEO::getCreateTime); List sarFileSplitInfoEOList = sarFileSplitInfoService.list(queryWrapper); Map flagMap = new HashMap<>(); - sarFileSplitInfoEOList.forEach(e -> flagMap.put(e.getFileType(), e.getId() + "," + e.getPublishBeforeId())); + sarFileSplitInfoEOList.forEach(e -> { + if (!flagMap.containsKey(e.getFileType())){ + flagMap.put(e.getFileType(), e.getId() + "," + e.getPublishBeforeId()); + } + }); // 拆分的标识 map.put(FieldCommon.FILE_PUBLISH_OF_ORIGINAL + FieldCommon._STANDARD_SPLIT,