From 2b3e157d884dcb961cf349076de31d2e849723eb Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Tue, 25 Feb 2020 17:14:10 +0800
Subject: [PATCH] =?UTF-8?q?Jeecg-Boot=202.1.4=20=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=20(=E7=89=88=E6=9C=AC=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ant-design-vue-jeecg/src/views/jeecg/SelectDemo.vue            | 3 ---
 .../jeecg/modules/system/mapper/xml/SysPermissionMapper.xml    | 3 ++-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/jeecg/SelectDemo.vue b/ant-design-vue-jeecg/src/views/jeecg/SelectDemo.vue
index cfc787d..164c4c5 100644
--- a/ant-design-vue-jeecg/src/views/jeecg/SelectDemo.vue
+++ b/ant-design-vue-jeecg/src/views/jeecg/SelectDemo.vue
@@ -180,7 +180,6 @@
               <a-button style="margin-right: 8px;" @click="()=>modal.visible=true">点击弹出JModal</a-button>
               <span style="margin-right: 8px;">全屏化：<a-switch v-model="modal.fullscreen"/></span>
               <span style="margin-right: 8px;">允许切换全屏：<a-switch v-model="modal.switchFullscreen"/></span>
-              <span>锁定Body滚动：<a-switch v-model="modal.lockScroll"/></span>
 
             </a-form-item>
 
@@ -188,7 +187,6 @@
               :visible.sync="modal.visible"
               :width="1200"
               :title="modal.title"
-              :lockScroll="modal.lockScroll"
               :fullscreen.sync="modal.fullscreen"
               :switchFullscreen="modal.switchFullscreen"
             >
@@ -390,7 +388,6 @@ sayHi('hello, world!')`
         modal: {
           title: '这里是标题',
           visible: false,
-          lockScroll: true,
           fullscreen: true,
           switchFullscreen: true,
         },
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml
index 5cf617b..8f3dcc6 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml
@@ -52,7 +52,8 @@
 						where p.id = a.permission_id AND d.username = #{username,jdbcType=VARCHAR}
 					)
 					<!--update begin Author:taoyan  Date:20200225 for：默认授权online的auto动态隐藏路由 -->
-					or (p.url like '%:code' and p.url like '/online%' and p.hidden = 1) )
+					or (p.url like '%:code' and p.url like '/online%' and p.hidden = 1)
+					or (p.url = '/online') )
 					<!--update end Author:taoyan  Date:20200213 for：默认授权online的auto动态隐藏路由  -->
 			   and p.del_flag = 0
 			<!--update begin Author:lvdandan  Date:20200225 for：加入部门权限 -->
-- 
GitLab