From 4e8dd706d568d1276ad82a0bf8f4ba13c5dac5ef Mon Sep 17 00:00:00 2001
From: 0慕容雪0 <ytu.mxh@163.com>
Date: 星期五, 10 三月 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-framework/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java | 15 ++++-----------
1 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java
index 3e74580..7f8e1d5 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java
@@ -5,7 +5,7 @@
/**
* 验证码文本生成器
- *
+ *
* @author ruoyi
*/
public class KaptchaTextCreator extends DefaultTextCreator
@@ -20,7 +20,7 @@
int x = random.nextInt(10);
int y = random.nextInt(10);
StringBuilder suChinese = new StringBuilder();
- int randomoperands = (int) Math.round(Math.random() * 2);
+ int randomoperands = random.nextInt(3);
if (randomoperands == 0)
{
result = x * y;
@@ -30,7 +30,7 @@
}
else if (randomoperands == 1)
{
- if (!(x == 0) && y % x == 0)
+ if ((x != 0) && y % x == 0)
{
result = y / x;
suChinese.append(CNUMBERS[y]);
@@ -45,7 +45,7 @@
suChinese.append(CNUMBERS[y]);
}
}
- else if (randomoperands == 2)
+ else
{
if (x >= y)
{
@@ -61,13 +61,6 @@
suChinese.append("-");
suChinese.append(CNUMBERS[x]);
}
- }
- else
- {
- result = x + y;
- suChinese.append(CNUMBERS[x]);
- suChinese.append("+");
- suChinese.append(CNUMBERS[y]);
}
suChinese.append("=?@" + result);
return suChinese.toString();
--
Gitblit v1.9.2