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 1/2] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=E5=88=97=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}
+
+
+
+ gtd.table_id = #{tableId}
+
+
+ and gtd.status = #{status}
+
+
+ and gtd.function_id = #{functionId}
+
+
ORDER BY gtd.sort_lv ASC
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 @@
and gtd.status = #{status}
+
+ and gtd.function_id = #{functionId}
+
ORDER BY gtd.sort_lv ASC
From e01ebe33e244e552c8148bada84ba42236d3a8a6 Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Thu, 29 Jul 2021 11:51:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
README.md | 2 ++
1 file changed, 2 insertions(+)
diff --git a/README.md b/README.md
index b9bb7fb..2c034f2 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,8 @@ gaotao-fast
│
├─modules 功能模块
│ ├─app API接口模块(APP调用)
+│ ├─language 语言维护模块
+│ ├─grid table自定义
│ ├─job 定时任务模块
│ ├─oss 文件服务模块
│ └─sys 权限模块