diff --git a/ant-design-vue-jeecg/src/views/jeecg/SelectDemo.vue b/ant-design-vue-jeecg/src/views/jeecg/SelectDemo.vue index cfc787d3..164c4c53 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 @@ 点击弹出JModal 全屏化: 允许切换全屏: - 锁定Body滚动: @@ -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 5cf617b7..8f3dcc6e 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} ) - 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') ) and p.del_flag = 0