From 8302ba4c2cadca26e2c223b29700452395fb3cf6 Mon Sep 17 00:00:00 2001 From: hchvhg <1334524325@qq.com> Date: Mon, 23 Jun 2025 15:42:48 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=A4=84=E7=90=86DictDataVO=E7=B1=BB?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sa/base/module/support/dict/domain/vo/DictDataVO.java | 1 + 1 file changed, 1 insertion(+) diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/vo/DictDataVO.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/vo/DictDataVO.java index fe940b1b..373092e7 100644 --- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/vo/DictDataVO.java +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/vo/DictDataVO.java @@ -3,6 +3,7 @@ package net.lab1024.sa.base.module.support.dict.domain.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.io.Serializable; import java.time.LocalDateTime; /** From 143a500c44af5a52cc12ca34d3eea64b0f83c3bb Mon Sep 17 00:00:00 2001 From: hchvhg <1334524325@qq.com> Date: Mon, 23 Jun 2025 16:04:53 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=94=9F=E6=88=90=E5=8A=9F=E8=83=BD=E9=9D=9E=E7=A9=BA=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=8F=96=E5=80=BC=E9=97=AE=E9=A2=98(=E5=8F=96?= =?UTF-8?q?=E5=80=BC=E5=8F=96=E5=8F=8D=E4=BA=86)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../support/codegenerator/service/CodeGeneratorService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorService.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorService.java index 2976097a..18c70543 100644 --- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorService.java +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorService.java @@ -65,7 +65,7 @@ public class CodeGeneratorService { public List getTableColumns(String tableName) { List tableColumns = codeGeneratorDao.selectTableColumn(tableName); for (TableColumnVO tableColumn : tableColumns) { - tableColumn.setNullableFlag(!COLUMN_NULLABLE_IDENTIFY.equalsIgnoreCase(tableColumn.getIsNullable())); + tableColumn.setNullableFlag(COLUMN_NULLABLE_IDENTIFY.equalsIgnoreCase(tableColumn.getIsNullable())); tableColumn.setPrimaryKeyFlag(COLUMN_PRIMARY_KEY.equalsIgnoreCase(tableColumn.getColumnKey())); tableColumn.setAutoIncreaseFlag(SmartStringUtil.isNotEmpty(tableColumn.getExtra()) && COLUMN_AUTO_INCREASE.equalsIgnoreCase(tableColumn.getExtra())); } From b2aa70ce9ea8e8b181601cd97c8ddcb72218491e Mon Sep 17 00:00:00 2001 From: hchvhg <1334524325@qq.com> Date: Mon, 23 Jun 2025 16:14:02 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9A=82=E6=97=B6=E6=81=A2=E5=A4=8D?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../support/codegenerator/service/CodeGeneratorService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorService.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorService.java index 18c70543..2976097a 100644 --- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorService.java +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorService.java @@ -65,7 +65,7 @@ public class CodeGeneratorService { public List getTableColumns(String tableName) { List tableColumns = codeGeneratorDao.selectTableColumn(tableName); for (TableColumnVO tableColumn : tableColumns) { - tableColumn.setNullableFlag(COLUMN_NULLABLE_IDENTIFY.equalsIgnoreCase(tableColumn.getIsNullable())); + tableColumn.setNullableFlag(!COLUMN_NULLABLE_IDENTIFY.equalsIgnoreCase(tableColumn.getIsNullable())); tableColumn.setPrimaryKeyFlag(COLUMN_PRIMARY_KEY.equalsIgnoreCase(tableColumn.getColumnKey())); tableColumn.setAutoIncreaseFlag(SmartStringUtil.isNotEmpty(tableColumn.getExtra()) && COLUMN_AUTO_INCREASE.equalsIgnoreCase(tableColumn.getExtra())); } From 2b6ead23bda8234bf5ab35cf07ae5db3d9318531 Mon Sep 17 00:00:00 2001 From: hchvhg <1334524325@qq.com> Date: Mon, 23 Jun 2025 16:16:06 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=94=9F=E6=88=90=E5=8A=9F=E8=83=BD=E4=B8=AD=E9=9D=9E=E7=A9=BA?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=8F=96=E5=80=BC=E9=97=AE=E9=A2=98(?= =?UTF-8?q?=E5=8F=96=E5=80=BC=E5=8F=96=E5=8F=8D=E4=BA=86)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../support/codegenerator/service/CodeGeneratorService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorService.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorService.java index 2976097a..18c70543 100644 --- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorService.java +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorService.java @@ -65,7 +65,7 @@ public class CodeGeneratorService { public List getTableColumns(String tableName) { List tableColumns = codeGeneratorDao.selectTableColumn(tableName); for (TableColumnVO tableColumn : tableColumns) { - tableColumn.setNullableFlag(!COLUMN_NULLABLE_IDENTIFY.equalsIgnoreCase(tableColumn.getIsNullable())); + tableColumn.setNullableFlag(COLUMN_NULLABLE_IDENTIFY.equalsIgnoreCase(tableColumn.getIsNullable())); tableColumn.setPrimaryKeyFlag(COLUMN_PRIMARY_KEY.equalsIgnoreCase(tableColumn.getColumnKey())); tableColumn.setAutoIncreaseFlag(SmartStringUtil.isNotEmpty(tableColumn.getExtra()) && COLUMN_AUTO_INCREASE.equalsIgnoreCase(tableColumn.getExtra())); }