From 25aac947f7b8b503ffd081b97d48d624114c936e Mon Sep 17 00:00:00 2001 From: Bull-BCLS <1019113057@qq.com> Date: Tue, 29 Aug 2023 09:56:10 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=A1=A8=E6=8C=89=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=8E=92=E5=BA=8F=E6=97=B6=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=97=B6=E9=97=B4=E4=B8=BA=E7=A9=BA=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E7=9A=84=20NPE=20=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 | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) 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 ba5bcd0f..4ba4620f 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 @@ -19,10 +19,7 @@ package top.charles7c.cnadmin.tool.service.impl; 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.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -91,7 +88,9 @@ public class GeneratorServiceImpl implements GeneratorService { } tableList.removeIf(table -> StrUtil.equalsAny(table.getTableName(), generatorProperties.getExcludeTables())); CollUtil.sort(tableList, - Comparator.comparing(Table::getCreateTime).thenComparing(Table::getUpdateTime).reversed()); + Comparator.comparing(Table::getCreateTime) + .thenComparing(table -> Optional.ofNullable(table.getUpdateTime()).orElse(table.getCreateTime())) + .reversed()); List tableVOList = BeanUtil.copyToList(tableList, TableVO.class); PageDataVO pageDataVO = PageDataVO.build(pageQuery.getPage(), pageQuery.getSize(), tableVOList); for (TableVO tableVO : pageDataVO.getList()) {