From aaaa8b4e4dc563722268a682863330c4c4ca8a6b Mon Sep 17 00:00:00 2001
From: diant <diantu188@163.com>
Date: Mon, 15 May 2023 11:30:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BE=BE=E6=A2=A6=EF=BC=8Coracle<=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E6=9F=A5=E8=AF=A2=E8=A1=A8=E5=AD=97=E6=AE=B5sql>?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zyplayer/doc/db/framework/db/mapper/dm/DmBaseMapper.xml | 6 +++---
 .../doc/db/framework/db/mapper/oracle/OracleBaseMapper.xml  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/dm/DmBaseMapper.xml b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/dm/DmBaseMapper.xml
index 4f6b844b..6f058096 100644
--- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/dm/DmBaseMapper.xml
+++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/dm/DmBaseMapper.xml
@@ -57,9 +57,9 @@
     <!-- 条件查询表字段 -->
     <select id="getTableAndColumnBySearch" resultMap="QueryTableColumnDescDtoMap">
         select t.TABLE_NAME,t.COLUMN_NAME,t.DATA_TYPE,case t.NULLABLE when 'Y' then 1 when 'N' then 0 end NULLABLE, c.COMMENTS
-        from user_tab_columns t
-                 left join user_col_comments c on t.COLUMN_NAME = c.COLUMN_NAME and t.TABLE_NAME = c.TABLE_NAME
-        where t.TABLE_NAME = #{tableName} AND (t.COLUMN_NAME like #{searchText} or c.COMMENTS like #{searchText})
+        from all_tab_columns t
+                 left join all_col_comments c on t.COLUMN_NAME = c.COLUMN_NAME and t.TABLE_NAME = c.TABLE_NAME
+        where t.OWNER = #{dbName} AND (upper(t.COLUMN_NAME) like upper(#{searchText}) or upper(c.COMMENTS) like upper(#{searchText}))
     </select>
 
     <!-- 条件查询表 -->
diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/oracle/OracleBaseMapper.xml b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/oracle/OracleBaseMapper.xml
index 4f6b844b..6f058096 100644
--- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/oracle/OracleBaseMapper.xml
+++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/oracle/OracleBaseMapper.xml
@@ -57,9 +57,9 @@
     <!-- 条件查询表字段 -->
     <select id="getTableAndColumnBySearch" resultMap="QueryTableColumnDescDtoMap">
         select t.TABLE_NAME,t.COLUMN_NAME,t.DATA_TYPE,case t.NULLABLE when 'Y' then 1 when 'N' then 0 end NULLABLE, c.COMMENTS
-        from user_tab_columns t
-                 left join user_col_comments c on t.COLUMN_NAME = c.COLUMN_NAME and t.TABLE_NAME = c.TABLE_NAME
-        where t.TABLE_NAME = #{tableName} AND (t.COLUMN_NAME like #{searchText} or c.COMMENTS like #{searchText})
+        from all_tab_columns t
+                 left join all_col_comments c on t.COLUMN_NAME = c.COLUMN_NAME and t.TABLE_NAME = c.TABLE_NAME
+        where t.OWNER = #{dbName} AND (upper(t.COLUMN_NAME) like upper(#{searchText}) or upper(c.COMMENTS) like upper(#{searchText}))
     </select>
 
     <!-- 条件查询表 -->