diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/DateUtils.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/DateUtils.java index bb6364cc7..d58aa1d68 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/DateUtils.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/DateUtils.java @@ -699,6 +699,7 @@ public class DateUtils extends PropertyEditorSupport { } newStrList.add(newStr); } + newStrList.sort((t1, t2) -> t1.compareTo(t2)); // 日期增序 return org.apache.commons.lang3.StringUtils.join(newStrList, ","); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index 24bbbe2d0..b6cd31635 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -542,6 +542,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl valuesList = Arrays.asList(itemsMap.get(dbFieldName).toString().split(",")); + valuesList.sort((t1, t2) -> t1.compareTo(t2)); // 日期增序 + itemsMap.put(dbFieldName, valuesList); + } + } + // 人员选择 if (FieldTypeEnum.PERSON.getValue().equals(fieldType)) { if (StringUtils.isNotBlank((String)itemsMap.get(dbFieldName))) { List sysUserList = sysUserService.listByIds(Arrays.asList(itemsMap.get(dbFieldName).toString().split(","))); @@ -829,6 +840,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl names = new ArrayList<>(); for(int i=0; i> documentLibraryEOList = documentLibraryEOService.queryListByIds(itemsMap.get(dbFieldName).toString()); @@ -2066,16 +2079,18 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl