From 0fd4a66d81440a55305ecea3096c6822b8ef6bbe Mon Sep 17 00:00:00 2001
From: wangzhibiao <wangzhibiao@gitlab.com>
Date: Mon, 14 Sep 2026 00:49:05 +0800
Subject: [PATCH] =?UTF-8?q?fix(db):=20=E9=80=82=E9=85=8DKingbaseES=20schem?=
 =?UTF-8?q?a=E6=90=9C=E7=B4=A2=E8=B7=AF=E5=BE=84=E4=B8=8E=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90=E5=99=A8=E5=85=83=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 application-druid.yml 中为连接池配置 SET search_path TO public, sys_catalog，优先访问 public 业务表，解决若依系统表与 Kingbase 内置系统视图同名冲突
- 将代码生成器 GenTableMapper 与 GenTableColumnMapper 中的 table_schema 过滤从 current_database() 调整为 current_schema()，使代码生成器正常识别 Kingbase 表结构与列信息
---
 .../ruoyi-admin/src/main/resources/application-druid.yml    | 3 ++-
 .../resources/mapper/generator/GenTableColumnMapper.xml     | 2 +-
 .../src/main/resources/mapper/generator/GenTableMapper.xml  | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/RuoYi-Vue/ruoyi-admin/src/main/resources/application-druid.yml b/RuoYi-Vue/ruoyi-admin/src/main/resources/application-druid.yml
index ac7364e72..6fc481a2b 100644
--- a/RuoYi-Vue/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/RuoYi-Vue/ruoyi-admin/src/main/resources/application-druid.yml
@@ -17,9 +17,10 @@ spring:
                 #url: jdbc:mysql://83.102.67.232:3306/judge?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
                 #url: jdbc:mysql://127.0.0.1:3306/s_builder_kj?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
                 #221 local dev env kingbase (via 100.70.157.41 tunnel):
-                url: jdbc:kingbase8://127.0.0.1:4321/training?currentSchema=public&useUnicode=true&characterEncoding=utf8
+                url: jdbc:kingbase8://127.0.0.1:4321/training?currentSchema=public,sys_catalog&useUnicode=true&characterEncoding=utf8
                 username: kingbase
                 password: sict123456
+                connectionInitSqls: ["SET search_path TO public, sys_catalog"]
 
                 # prod env kingbase:
                 #url: jdbc:kingbase8://localhost:54321/graph?currentSchema=public&useUnicode=true&characterEncoding=utf8
diff --git a/RuoYi-Vue/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/RuoYi-Vue/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml
index c50a4a174..c896a15db 100644
--- a/RuoYi-Vue/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml
+++ b/RuoYi-Vue/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml
@@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectDbTableColumnsByName" parameterType="String" resultMap="GenTableColumnResult">
 		select column_name, (case when (is_nullable = 'no' <![CDATA[ && ]]> column_key != 'PRI') then '1' else '0' end) as is_required, (case when column_key = 'PRI' then '1' else '0' end) as is_pk, ordinal_position as sort, column_comment, (case when extra = 'auto_increment' then '1' else '0' end) as is_increment, column_type
-		from information_schema.columns where table_schema = (select current_database()) and table_name = (#{tableName})
+		from information_schema.columns where table_schema = (select current_schema()) and table_name = (#{tableName})
 		order by ordinal_position
 	</select>
 
diff --git a/RuoYi-Vue/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml b/RuoYi-Vue/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
index 8e329d7e4..056940139 100644
--- a/RuoYi-Vue/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
+++ b/RuoYi-Vue/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
@@ -78,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<select id="selectDbTableList" parameterType="GenTable" resultMap="GenTableResult">
 		select table_name, table_comment, create_time, update_time from information_schema.tables
-		where table_schema = (select current_database())
+		where table_schema = (select current_schema())
 		AND table_name NOT LIKE 'qrtz\_%' AND table_name NOT LIKE 'gen\_%'
 		AND table_name NOT IN (select table_name from gen_table)
 		<if test="tableName != null and tableName != ''">
@@ -98,7 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	
 	<select id="selectDbTableListByNames" resultMap="GenTableResult">
 		select table_name, table_comment, create_time, update_time from information_schema.tables
-		where table_name NOT LIKE 'qrtz\_%' and table_name NOT LIKE 'gen\_%' and table_schema = (select current_database())
+		where table_name NOT LIKE 'qrtz\_%' and table_name NOT LIKE 'gen\_%' and table_schema = (select current_schema())
 		and table_name in
 	    <foreach collection="array" item="name" open="(" separator="," close=")">
  			#{name}
@@ -107,7 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	
 	<select id="selectTableByName" parameterType="String" resultMap="GenTableResult">
 		select table_name, table_comment, create_time, update_time from information_schema.tables
-		where table_comment <![CDATA[ <> ]]> '' and table_schema = (select current_database())
+		where table_comment <![CDATA[ <> ]]> '' and table_schema = (select current_schema())
 		and table_name = #{tableName}
 	</select>