From 4e8dd706d568d1276ad82a0bf8f4ba13c5dac5ef Mon Sep 17 00:00:00 2001
From: 0慕容雪0 <ytu.mxh@163.com>
Date: Fri, 10 Mar 2023 16:22:35 +0800
Subject: [PATCH] update ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java. DataScopeAspect,数据权限切面处理类中，用户多角色情况下，若所有角色都不包含传递过来的权限字符，这个时候sqlString也会为空，会导致用户拥有全部数据权限，所以要限制一下, 可以根据conditions集合是否为空，来判断循环时所有角色是否都是在判断权限字符时continue了。 复现方法: 在使用@DataScope注解时permission定义了值,这个值所有角色不包含。
---
ruoyi-ui/src/components/Screenfull/index.vue | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/ruoyi-ui/src/components/Screenfull/index.vue b/ruoyi-ui/src/components/Screenfull/index.vue
index 099d74d..85937c9 100644
--- a/ruoyi-ui/src/components/Screenfull/index.vue
+++ b/ruoyi-ui/src/components/Screenfull/index.vue
@@ -22,11 +22,8 @@
},
methods: {
click() {
- if (!screenfull.enabled) {
- this.$message({
- message: 'you browser can not work',
- type: 'warning'
- })
+ if (!screenfull.isEnabled) {
+ this.$message({ message: '你的浏览器不支持全屏', type: 'warning' })
return false
}
screenfull.toggle()
@@ -35,12 +32,12 @@
this.isFullscreen = screenfull.isFullscreen
},
init() {
- if (screenfull.enabled) {
+ if (screenfull.isEnabled) {
screenfull.on('change', this.change)
}
},
destroy() {
- if (screenfull.enabled) {
+ if (screenfull.isEnabled) {
screenfull.off('change', this.change)
}
}
--
Gitblit v1.9.2