From 6790d2e39e192efeff904406bbeecd329d423bae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=AD=E6=BB=8B=E6=BB=8B=E5=84=BF?= <3440626@qq.com>
Date: Thu, 5 Sep 2019 15:32:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E7=89=88=E5=9D=97=E5=AF=BC=E5=85=A5=E6=97=B6=E4=B8=BB?=
 =?UTF-8?q?=E4=B8=BB=E9=94=AE=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/generator/GenTableColumnMapper.xml | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml
index de72188..68139f0 100644
--- a/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml
+++ b/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml
@@ -40,18 +40,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     
     <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(G.[VALUE] as nvarchar) as column_comment
-		FROM   SYSCOLUMNS   A
-			LEFT   JOIN   SYSTYPES   B   ON   A.XTYPE=B.XUSERTYPE
-			INNER   JOIN   SYSOBJECTS   D   ON   A.ID=D.ID     AND   D.XTYPE='U'   AND     D.NAME!='DTPROPERTIES'
-			LEFT   JOIN   SYS.EXTENDED_PROPERTIES G   ON   A.ID=G.MAJOR_ID   AND   A.COLID=G.MINOR_ID
-			LEFT   JOIN   SYS.EXTENDED_PROPERTIES F   ON   D.ID=F.MAJOR_ID   AND   F.MINOR_ID   =0
-		where   D.NAME = #{tableName}
-		ORDER   BY   A.COLORDER
-	</select>
+        SELECT
+            cast(A.NAME as nvarchar) as column_name,
+            cast(B.NAME as nvarchar) 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
+            LEFT   JOIN   SYSTYPES   B   ON   A.XTYPE=B.XUSERTYPE
+            INNER   JOIN   SYSOBJECTS   D   ON   A.ID=D.ID     AND   D.XTYPE='U'   AND     D.NAME!='DTPROPERTIES'
+            LEFT   JOIN   SYS.EXTENDED_PROPERTIES G   ON   A.ID=G.MAJOR_ID   AND   A.COLID=G.MINOR_ID
+            LEFT   JOIN   SYS.EXTENDED_PROPERTIES F   ON   D.ID=F.MAJOR_ID   AND   F.MINOR_ID   =0
+        where   D.NAME = #{tableName}
+        ORDER   BY   A.COLORDER
+    </select>
     
     <insert id="insertGenTableColumn" parameterType="GenTableColumn" useGeneratedKeys="true" keyProperty="columnId">
         insert into gen_table_column (