From ea853a54bbddfd92f81b964782709a1b61a6498a Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Fri, 4 Nov 2022 17:55:30 +0800
Subject: [PATCH] 1

---
 .../mapper/grid/GridTableDefaultDao.xml         | 17 +++++++++--------
 .../resources/mapper/grid/GridTableUserDao.xml  | 15 ++++++++-------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/main/resources/mapper/grid/GridTableDefaultDao.xml b/src/main/resources/mapper/grid/GridTableDefaultDao.xml
index bc31113..3818eab 100644
--- a/src/main/resources/mapper/grid/GridTableDefaultDao.xml
+++ b/src/main/resources/mapper/grid/GridTableDefaultDao.xml
@@ -16,7 +16,8 @@
             parameterType="com.srq.modules.grid.query.GridTableDefaultQuery">
         SELECT gtd.table_id,
         gtd.column_prop,
-        ISNULL(gtl.language_value, gtd.column_label) AS column_label,
+<!--        ISNULL(gtl.language_value, gtd.column_label) AS column_label,-->
+gtd.column_label,
         gtd.column_hidden,
         gtd.column_image,
         gtd.column_sortable,
@@ -30,17 +31,17 @@
         gtd.align,
         gtd.header_align
         FROM grid_table_default gtd
-        LEFT JOIN sys_object_language_others gtl
-        ON (gtd.table_id = gtl.table_id AND gtd.column_prop = gtl.object_id
-        AND gtd.function_id = gtl.function_id )
+<!--        LEFT JOIN sys_object_language_others gtl-->
+<!--        ON (gtd.table_id = gtl.table_id AND gtd.column_prop = gtl.object_id-->
+<!--        AND gtd.function_id = gtl.function_id )-->
         <where>
-            gtl.object_type='table' AND gtl.language_code = #{languageCode}
+<!--            gtl.object_type='table' AND gtl.language_code = #{languageCode}-->
             <if test="tableId != null and tableId != ''">
                 and gtd.table_id = #{tableId,jdbcType=VARCHAR}
             </if>
-            <if test="objectType != null and objectType != ''">
-                and gtl.object_type = #{objectType,jdbcType=VARCHAR}
-            </if>
+<!--            <if test="objectType != null and objectType != ''">-->
+<!--                and gtl.object_type = #{objectType,jdbcType=VARCHAR}-->
+<!--            </if>-->
             <if test="status != null and status != ''">
                 and gtd.status = #{status,jdbcType=BOOLEAN}
             </if>
diff --git a/src/main/resources/mapper/grid/GridTableUserDao.xml b/src/main/resources/mapper/grid/GridTableUserDao.xml
index da32264..70371a5 100644
--- a/src/main/resources/mapper/grid/GridTableUserDao.xml
+++ b/src/main/resources/mapper/grid/GridTableUserDao.xml
@@ -21,7 +21,8 @@
         gtd.user_id,
         gtd.table_id,
         gtd.column_prop,
-        ISNULL( gtl.language_value, gtd.column_label ) AS column_label,
+<!--        ISNULL( gtl.language_value, gtd.column_label ) AS column_label,-->
+gtd.column_label,
         gtd.column_hidden,
         gtd.column_image,
         gtd.column_sortable,
@@ -36,17 +37,17 @@
         gtd.header_align
         FROM
         grid_table_user gtd
-        LEFT JOIN sys_object_language_others gtl ON ( gtd.table_id = gtl.table_id AND gtd.column_prop = gtl.object_id
-        AND gtd.function_id = gtl.function_id )
+<!--        LEFT JOIN sys_object_language_others gtl ON ( gtd.table_id = gtl.table_id AND gtd.column_prop = gtl.object_id-->
+<!--        AND gtd.function_id = gtl.function_id )-->
 
         <where>
-            gtl.object_type='table' AND gtl.language_code = #{languageCode}
+<!--            gtl.object_type='table' AND gtl.language_code = #{languageCode}-->
             <if test="tableId != null and tableId != ''">
              and   gtd.table_id = #{tableId,jdbcType=VARCHAR}
             </if>
-            <if test="objectType != null and objectType != ''">
-               and gtl.object_type = #{objectType,jdbcType=VARCHAR}
-            </if>
+<!--            <if test="objectType != null and objectType != ''">-->
+<!--               and gtl.object_type = #{objectType,jdbcType=VARCHAR}-->
+<!--            </if>-->
             <if test="userId != null and userId != ''">
                 and gtd.user_id = #{userId,jdbcType=VARCHAR}
             </if>