From c90b34e88c6489f3e545d7544d512c9c0ecb3443 Mon Sep 17 00:00:00 2001 From: Kris <2893855659@qq.com> Date: Sun, 8 Dec 2024 03:53:18 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E8=B0=83=E6=95=B4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/czsj/common/constant/GenConstants.java | 5 ++--- .../src/main/java/com/czsj/generator/util/GenUtils.java | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/czsj-common/src/main/java/com/czsj/common/constant/GenConstants.java b/czsj-common/src/main/java/com/czsj/common/constant/GenConstants.java index 0aaf2ad..70594ae 100644 --- a/czsj-common/src/main/java/com/czsj/common/constant/GenConstants.java +++ b/czsj-common/src/main/java/com/czsj/common/constant/GenConstants.java @@ -45,11 +45,10 @@ public class GenConstants "bit", "bigint", "float", "double", "decimal" }; /** 页面不需要编辑字段 */ - public static final String[] COLUMNNAME_NOT_EDIT = { "id", "create_by", "create_time", "del_flag" }; + public static final String[] COLUMNNAME_NOT_EDIT = { "id", "create_user_id","update_user_id","update_time", "create_time", "del_flag" }; /** 页面不需要显示的列表字段 */ - public static final String[] COLUMNNAME_NOT_LIST = { "id", "create_by", "create_time", "del_flag", "update_by", - "update_time" }; + public static final String[] COLUMNNAME_NOT_LIST = { "id", "create_by", "del_flag", "update_by"}; /** 页面不需要查询字段 */ public static final String[] COLUMNNAME_NOT_QUERY = { "id", "create_by", "create_time", "del_flag", "update_by", diff --git a/czsj-generator/src/main/java/com/czsj/generator/util/GenUtils.java b/czsj-generator/src/main/java/com/czsj/generator/util/GenUtils.java index a6a1885..799fc3b 100644 --- a/czsj-generator/src/main/java/com/czsj/generator/util/GenUtils.java +++ b/czsj-generator/src/main/java/com/czsj/generator/util/GenUtils.java @@ -67,7 +67,7 @@ public class GenUtils column.setJavaType(GenConstants.TYPE_BIGDECIMAL); } // 如果是整形 - else if (str != null && str.length == 1 && Integer.parseInt(str[0]) <= 10) + else if ((str != null && str.length == 1 && Integer.parseInt(str[0]) <= 10) || "int".equals(column.getColumnType())) { column.setJavaType(GenConstants.TYPE_INTEGER); }