From f8e5e55fbf2cac825f83e036aee25bcf9e08b947 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Thu, 24 Aug 2023 21:59:45 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E8=A1=A8=E6=9C=AA=E6=8C=89=E6=97=B6=E9=97=B4=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cnadmin/tool/service/impl/GeneratorServiceImpl.java | 3 +++ continew-admin-ui/src/views/tool/generator/index.vue | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/service/impl/GeneratorServiceImpl.java b/continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/service/impl/GeneratorServiceImpl.java index ec37b81..ba5bcd0 100644 --- a/continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/service/impl/GeneratorServiceImpl.java +++ b/continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/service/impl/GeneratorServiceImpl.java @@ -20,6 +20,7 @@ import java.io.File; import java.nio.charset.StandardCharsets; import java.sql.SQLException; import java.util.Collection; +import java.util.Comparator; import java.util.List; import java.util.Map; import java.util.function.Function; @@ -89,6 +90,8 @@ public class GeneratorServiceImpl implements GeneratorService { tableList.removeIf(table -> !StrUtil.containsAny(table.getTableName(), tableName)); } tableList.removeIf(table -> StrUtil.equalsAny(table.getTableName(), generatorProperties.getExcludeTables())); + CollUtil.sort(tableList, + Comparator.comparing(Table::getCreateTime).thenComparing(Table::getUpdateTime).reversed()); List tableVOList = BeanUtil.copyToList(tableList, TableVO.class); PageDataVO pageDataVO = PageDataVO.build(pageQuery.getPage(), pageQuery.getSize(), tableVOList); for (TableVO tableVO : pageDataVO.getList()) { diff --git a/continew-admin-ui/src/views/tool/generator/index.vue b/continew-admin-ui/src/views/tool/generator/index.vue index ad731bc..67e4937 100644 --- a/continew-admin-ui/src/views/tool/generator/index.vue +++ b/continew-admin-ui/src/views/tool/generator/index.vue @@ -317,7 +317,6 @@ tableName: undefined, page: 1, size: 10, - sort: ['createTime,desc', 'updateTime,desc'], }, // 表单数据 form: {} as GenConfigRecord, -- GitLab