* 修正MSSQL和代码生成错误。

luanx · Jun 16, 2015 · 6824dc6 · 6824dc6
1 parent fec71ae
commit 6824dc6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/db/oa/jeesite_mssql.sql b/db/oa/jeesite_mssql.sql
@@ -57,7 +57,7 @@ CREATE TABLE oa_notify_record
 	oa_notify_id varchar(64),
 	user_id varchar(64),
 	read_flag char(1) DEFAULT '0',
-	read_date date,
+	read_date smalldatetime,
 	PRIMARY KEY (id)
 );
 

diff --git a/db/test/jeesite_mssql.sql b/db/test/jeesite_mssql.sql
@@ -20,7 +20,7 @@ CREATE TABLE test_data
 	area_id varchar(64),
 	name varchar(100),
 	sex char(1),
-	in_date date,
+	in_date smalldatetime,
 	create_by varchar(64) NOT NULL,
 	create_date datetime NOT NULL,
 	update_by varchar(64) NOT NULL,
@@ -54,7 +54,7 @@ CREATE TABLE test_data_main
 	area_id varchar(64),
 	name varchar(100),
 	sex char(1),
-	in_date date,
+	in_date smalldatetime,
 	create_by varchar(64) NOT NULL,
 	create_date datetime NOT NULL,
 	update_by varchar(64) NOT NULL,

diff --git a/src/main/resources/mappings/modules/gen/GenDataBaseDictDao.xml b/src/main/resources/mappings/modules/gen/GenDataBaseDictDao.xml
@@ -16,8 +16,8 @@
 		</if>
 		<if test="dbName == 'mssql'">
 			SELECT t.name AS name,b.value AS comments 
-			FROM sys.objects t,sys.extended_properties b 
-			WHERE b.major_id=t.object_id and b.minor_id=0 and b.class=1 AND b.name='MS_Description'
+			FROM sys.objects t LEFT JOIN sys.extended_properties b ON b.major_id=t.object_id and b.minor_id=0 and b.class=1 AND b.name='MS_Description'
+			WHERE t.type='U'
 			<if test="name != null and name != ''">
 				AND t.name = upper(#{name})
 			</if>