From d5daf6b27dd2d73328bb5858a2f2e61311914fdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <2270033969@qq.com>
Date: Tue, 6 Aug 2024 18:53:11 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90):?=
 =?UTF-8?q?=20anyline=20=E5=88=87=E6=8D=A2=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=E9=80=82=E9=85=8D=E5=99=A8=E4=B8=8D=E5=8F=98=EF=BC=8C=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E8=AF=BB=E5=8F=96=E7=9A=84=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../config/PigxCodeGenDefaultProperties.java        | 13 ++++++++++++-
 .../codegen/service/impl/GenTableServiceImpl.java   |  8 +++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/config/PigxCodeGenDefaultProperties.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/config/PigxCodeGenDefaultProperties.java
index 6b473e832..806207672 100644
--- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/config/PigxCodeGenDefaultProperties.java
+++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/config/PigxCodeGenDefaultProperties.java
@@ -2,6 +2,8 @@ package com.pig4cloud.pigx.codegen.config;
 
 import cn.smallbun.screw.core.constant.DefaultConstants;
 import lombok.Data;
+import org.anyline.util.ConfigTable;
+import org.springframework.beans.factory.InitializingBean;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 
@@ -14,7 +16,7 @@ import org.springframework.context.annotation.Configuration;
 @Data
 @Configuration(proxyBeanMethods = false)
 @ConfigurationProperties(prefix = PigxCodeGenDefaultProperties.PREFIX)
-public class PigxCodeGenDefaultProperties {
+public class PigxCodeGenDefaultProperties implements InitializingBean {
 
 	public static final String PREFIX = "codegen";
 
@@ -78,4 +80,13 @@ public class PigxCodeGenDefaultProperties {
 	 */
 	private String syncRoute = "1";
 
+	/**
+     * <a href="http://doc.anyline.org/aa/3c_14011">集成mybatis动态数据源</a>
+     *
+     * @throws Exception 例外
+     */
+	@Override
+	public void afterPropertiesSet() throws Exception {
+		ConfigTable.KEEP_ADAPTER = 0;
+	}
 }
diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenTableServiceImpl.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenTableServiceImpl.java
index 2a86b418e..f1c2a6499 100644
--- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenTableServiceImpl.java
+++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenTableServiceImpl.java
@@ -125,10 +125,12 @@ public class GenTableServiceImpl extends ServiceImpl<GenTableMapper, GenTable> i
                     return StrUtil.containsIgnoreCase(t.getName(false), table.getTableName())
                             || StrUtil.containsIgnoreCase(t.getComment(), table.getTableName());
                 })
-                // 根据 createTime 、updateTime 倒序排序 ,如果有 updateTime 则按 updateTime ，如果有 createTime 则按 createTime
+                // 根据 createTime 、updateTime 倒序排序
                 .sorted((o1, o2) -> {
-                    long time1 = o1.getUpdateTime() == null ? o1.getCreateTime().getTime() : o1.getUpdateTime().getTime();
-                    long time2 = o2.getUpdateTime() == null ? o2.getCreateTime().getTime() : o2.getUpdateTime().getTime();
+                    long time1 = (o1.getUpdateTime() != null ? o1.getUpdateTime().getTime() :
+                            (o1.getCreateTime() != null ? o1.getCreateTime().getTime() : 0));
+                    long time2 = (o2.getUpdateTime() != null ? o2.getUpdateTime().getTime() :
+                            (o2.getCreateTime() != null ? o2.getCreateTime().getTime() : 0));
                     return NumberUtil.compare(time2, time1);
                 }).collect(Collectors.toList());