From db45e1903e27aae7ef7a25280b44c6986d541484 Mon Sep 17 00:00:00 2001
From: william <wangrong_0103@hotmail.com>
Date: Fri, 20 Sep 2019 17:13:32 +0800
Subject: [PATCH] =?UTF-8?q?1=EF=BC=89=E4=BF=AE=E6=AD=A3numeric=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=AD=A3=E5=B8=B8=E7=94=9F?=
 =?UTF-8?q?=E6=88=90domain=E9=97=AE=E9=A2=98=202=EF=BC=89=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E7=94=BB=E9=9D=A2=EF=BC=8C=E6=97=A0=E6=B3=95=E6=A8=A1=E7=B3=8A?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/common/constant/GenConstants.java | 2 +-
 .../main/resources/mapper/generator/GenTableColumnMapper.xml  | 2 +-
 .../src/main/resources/mapper/generator/GenTableMapper.xml    | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
index 30ea77e..2b90ccd 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
@@ -26,7 +26,7 @@ public class GenConstants
 
     /** 数据库数字类型 */
     public static final String[] COLUMNTYPE_NUMBER = { "tinyint", "smallint", "mediumint", "int", "number", "integer",
-            "bigint", "float", "float", "double", "decimal" };
+            "bigint", "float", "float", "double", "decimal", "numeric" };
 
     /** 页面不需要编辑字段 */
     public static final String[] COLUMNNAME_NOT_EDIT = { "id", "create_by", "create_time", "del_flag" };
diff --git a/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml
index 68139f0..b6e8d1a 100644
--- a/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml
+++ b/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml
@@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectDbTableColumnsByName" parameterType="String" resultMap="GenTableColumnResult">
         SELECT
             cast(A.NAME as nvarchar) as column_name,
-            cast(B.NAME as nvarchar) as column_type,
+            cast(B.NAME as nvarchar) + (case when B.NAME ='numeric' then '('+cast(A.prec as nvarchar)+','+cast(A.scale as nvarchar)+')' else '' end) as column_type,
             cast(G.[VALUE] as nvarchar) as column_comment,
             (SELECT 1  FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE Z  WHERE TABLE_NAME=D.NAME and A.NAME = Z.column_name  ) as is_pk
         FROM   SYSCOLUMNS   A
diff --git a/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml b/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
index 8947c87..3dc29e3 100644
--- a/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
+++ b/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
@@ -72,10 +72,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		AND   F.MINOR_ID=0 AND   D.XTYPE='U' AND  D.NAME!='DTPROPERTIES'
 		AND D.NAME NOT IN (select table_name from gen_table)
 		<if test="tableName != null and tableName != ''">
-			AND table_name like '%'+#{tableName}+ '%'
+			AND D.NAME like '%'+#{tableName}+ '%'
 		</if>
 		<if test="tableComment != null and tableComment != ''">
-			AND table_comment like '%'+#{tableComment}+ '%'
+			AND cast(F.VALUE as nvarchar) like '%'+#{tableComment}+ '%'
 		</if>
 	</select>