diff --git a/.Net6版本/VOL.Builder/Services/Core/Partial/Sys_TableInfoService.cs b/.Net6版本/VOL.Builder/Services/Core/Partial/Sys_TableInfoService.cs index 680d5b30..5b0d91ef 100644 --- a/.Net6版本/VOL.Builder/Services/Core/Partial/Sys_TableInfoService.cs +++ b/.Net6版本/VOL.Builder/Services/Core/Partial/Sys_TableInfoService.cs @@ -235,7 +235,7 @@ DISTINCT c.TABLE_NAME TableName , cc.COLUMN_NAME COLUMNNAME, cc.COMMENTS as ColumnCNName, - CASE WHEN c.DATA_TYPE IN('smallint', 'INT') THEN 'int' + CASE WHEN c.DATA_TYPE IN('smallint', 'INT') or (c.DATA_TYPE='NUMBER' and c.DATA_LENGTH=0) THEN 'int' WHEN c.DATA_TYPE IN('NUMBER') THEN 'decimal' WHEN c.DATA_TYPE IN('CHAR', 'VARCHAR', 'NVARCHAR','VARCHAR2', 'NVARCHAR2','text', 'image') THEN 'nvarchar' @@ -1088,7 +1088,7 @@ DISTINCT c.TABLE_NAME TableName , cc.COLUMN_NAME COLUMNNAME, cc.COMMENTS as ColumnCNName, - CASE WHEN c.DATA_TYPE IN('smallint', 'INT') THEN 'int' + CASE WHEN c.DATA_TYPE IN('smallint', 'INT') or (c.DATA_TYPE='NUMBER' and c.DATA_LENGTH=0) THEN 'int' WHEN c.DATA_TYPE IN('NUMBER') THEN 'decimal' WHEN c.DATA_TYPE IN('CHAR', 'VARCHAR', 'NVARCHAR','VARCHAR2', 'NVARCHAR2','text', 'image') THEN 'string' diff --git a/开发版dev/Net6开发版/VOL.Builder/Services/Core/Partial/Sys_TableInfoService.cs b/开发版dev/Net6开发版/VOL.Builder/Services/Core/Partial/Sys_TableInfoService.cs index 680d5b30..d703b47c 100644 --- a/开发版dev/Net6开发版/VOL.Builder/Services/Core/Partial/Sys_TableInfoService.cs +++ b/开发版dev/Net6开发版/VOL.Builder/Services/Core/Partial/Sys_TableInfoService.cs @@ -235,7 +235,7 @@ DISTINCT c.TABLE_NAME TableName , cc.COLUMN_NAME COLUMNNAME, cc.COMMENTS as ColumnCNName, - CASE WHEN c.DATA_TYPE IN('smallint', 'INT') THEN 'int' + CASE WHEN c.DATA_TYPE IN('smallint', 'INT') or (c.DATA_TYPE='NUMBER' and c.DATA_LENGTH=0) THEN 'int' WHEN c.DATA_TYPE IN('NUMBER') THEN 'decimal' WHEN c.DATA_TYPE IN('CHAR', 'VARCHAR', 'NVARCHAR','VARCHAR2', 'NVARCHAR2','text', 'image') THEN 'nvarchar' @@ -1088,7 +1088,7 @@ DISTINCT c.TABLE_NAME TableName , cc.COLUMN_NAME COLUMNNAME, cc.COMMENTS as ColumnCNName, - CASE WHEN c.DATA_TYPE IN('smallint', 'INT') THEN 'int' + CASE WHEN c.DATA_TYPE IN('smallint', 'INT') or (c.DATA_TYPE='NUMBER' and c.DATA_LENGTH=0) THEN 'int' WHEN c.DATA_TYPE IN('NUMBER') THEN 'decimal' WHEN c.DATA_TYPE IN('CHAR', 'VARCHAR', 'NVARCHAR','VARCHAR2', 'NVARCHAR2','text', 'image') THEN 'string' @@ -1850,7 +1850,7 @@ DISTINCT if ((column.IsKey == 1 && (column.ColumnType == "uniqueidentifier")) || column.ColumnType == "guid" - || ((IsMysql() || IsDM()|| IsOracle()) && column.ColumnType == "string" && column.Maxlength == 36)) + || ((IsMysql() || IsDM() || IsOracle()) && column.ColumnType == "string" && column.Maxlength == 36)) { columnType = "Guid" + (column.IsNull == 1 ? "?" : ""); }