From 3c2904e8602a8981ee2389cb9abc934b3da2ed15 Mon Sep 17 00:00:00 2001
From: forget-the-bright <kshelloworldwh@gmail.com>
Date: Wed, 13 Sep 2023 10:28:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DatabasetoEntityclass/SystemConfig.xml | 2 +-
 DatabasetoEntityclass/Util/DbUtil.cs   | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/DatabasetoEntityclass/SystemConfig.xml b/DatabasetoEntityclass/SystemConfig.xml
index 4aecece..4c820be 100644
--- a/DatabasetoEntityclass/SystemConfig.xml
+++ b/DatabasetoEntityclass/SystemConfig.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <SystemConfig>
 	<config name ="DataBaseType" ivalue="MYSQL" remark ="系统数据库类型">  </config>
-	<config name ="ConnString" ivalue ="server=10.40.18.18;port=3306;user=root;password=root_password; database=mesdb_nca;" remark ="数据库连接字符串">  </config>
+	<config name ="ConnString" ivalue ="server=10.40.18.18;port=3306;user=hbl;password=hbl_password; database=mesdb_nca;" remark ="数据库连接字符串">  </config>
 	<config name ="SystemParameter_tbname" ivalue="SYS_SystemParameter" remark ="系统初始参数表">  </config>
 </SystemConfig>
diff --git a/DatabasetoEntityclass/Util/DbUtil.cs b/DatabasetoEntityclass/Util/DbUtil.cs
index 10295ee..7b0db06 100644
--- a/DatabasetoEntityclass/Util/DbUtil.cs
+++ b/DatabasetoEntityclass/Util/DbUtil.cs
@@ -92,10 +92,12 @@ namespace GenerateClass.Util
                             AND c.COLUMN_NAME = k.COLUMN_NAME
                         WHERE
                             c.TABLE_NAME = '{0}'
+                            AND
+                            c.TABLE_SCHEMA = '{1}'
                         ORDER BY
                             c.ORDINAL_POSITION;";
             //string str = $"SELECT  COLUMN_NAME  AS Name, COLUMN_TYPE AS Type,COLUMN_COMMENT AS COMMENT FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '{tabname}'  ORDER BY ORDINAL_POSITION;";
-            var dt = DbHelperMySQL.Query(String.Format(sql, tabname));
+            var dt = DbHelperMySQL.Query(String.Format(sql, tabname, DbHelperMySQL.DbName));
             return dt;
         }