From 7febc32e20ed22d94b1460538827843d3fd7995d Mon Sep 17 00:00:00 2001 From: gaosong Date: Sun, 22 Oct 2023 18:54:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E9=A1=BA=E5=BA=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ParamsCollectManifestEOServiceImpl.java | 6 ++++-- .../collect/service/impl/ParamsConfigDataEOServiceImpl.java | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index c46ccd87d..d91b37a25 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -797,10 +797,12 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl"); + int index = 0; for (String col : referencesColArr) { List referencesColVOList = getReferencesColList(controlType, col, collectManifestEO, userTypes); // 重新组合配置数据 - String key = UUID.randomUUID().toString().replaceAll("-",""); + String key = index+"+"+UUID.randomUUID().toString().replaceAll("-",""); referencesColConfigDataVOMap.put(key,referencesColVOList); + index++; } referencesColMap.put("controlType", controlType); @@ -810,7 +812,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl referencesColVOList = getReferencesColList(controlType, " # # #", collectManifestEO, userTypes); // 重新组合配置数据 referencesColMap.put("controlType", controlType); - String key = UUID.randomUUID().toString().replaceAll("-",""); + String key = "0+"+UUID.randomUUID().toString().replaceAll("-",""); referencesColConfigDataVOMap.put(key,referencesColVOList); referencesColMap.put("paramsConfigData", referencesColConfigDataVOMap); manifestMap.put("referencesCol", referencesColMap); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataEOServiceImpl.java index b315e9704..b2c4791f6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataEOServiceImpl.java @@ -110,6 +110,7 @@ public class ParamsConfigDataEOServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(ParamsConfigDataEO::getParamsConfigId, paramsConfigId); queryWrapper.eq(ParamsConfigDataEO::getParamsCollectManifestId, paramsCollectManifestId); + queryWrapper.orderByAsc(ParamsConfigDataEO::getOrderNum); return this.list(queryWrapper); }