From b6bf258088df8756af11021edd673efd79f3199b Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Thu, 29 Jul 2021 11:49:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=88=97=E8=A1=A8=E5=88=97?=
 =?UTF-8?q?=20=E6=9D=A1=E4=BB=B6=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/application-dev.yml              |  1 +
 .../resources/mapper/grid/GridTableDefaultDao.xml   | 13 ++++++++++++-
 src/main/resources/mapper/grid/GridTableUserDao.xml |  3 +++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index ca78a2a..fbe9be8 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -24,6 +24,7 @@ spring:
                 url-pattern: /druid/*
                 #login-username: admin
                 #login-password: admin
+                allow: ""
             filter:
                 stat:
                     log-slow-sql: true
diff --git a/src/main/resources/mapper/grid/GridTableDefaultDao.xml b/src/main/resources/mapper/grid/GridTableDefaultDao.xml
index 2a76a3e..9004e8f 100644
--- a/src/main/resources/mapper/grid/GridTableDefaultDao.xml
+++ b/src/main/resources/mapper/grid/GridTableDefaultDao.xml
@@ -31,7 +31,18 @@
                            ON (gtd.table_id = gtl.table_id AND gtd.column_prop = gtl.object_id
                                AND gtd.function_id = gtl.function_id AND gtl.language_code = #{languageCode})
 
-        WHERE gtd.table_id = #{tableId}
+
+        <where>
+            <if test="tableId != null and tableId != ''">
+                gtd.table_id = #{tableId}
+            </if>
+            <if test="status != null and status != ''">
+                and gtd.status = #{status}
+            </if>
+            <if test="functionId != null and functionId != ''">
+                and gtd.function_id = #{functionId}
+            </if>
+        </where>
         ORDER BY gtd.sort_lv ASC
 
     </select>
diff --git a/src/main/resources/mapper/grid/GridTableUserDao.xml b/src/main/resources/mapper/grid/GridTableUserDao.xml
index 8e6965b..7c3e8be 100644
--- a/src/main/resources/mapper/grid/GridTableUserDao.xml
+++ b/src/main/resources/mapper/grid/GridTableUserDao.xml
@@ -46,6 +46,9 @@
             <if test="status != null and status != ''">
                 and gtd.status = #{status}
             </if>
+            <if test="functionId != null and functionId != ''">
+                and gtd.function_id = #{functionId}
+            </if>
         </where>
         ORDER BY gtd.sort_lv ASC