From c145b8645ed1a531a14ca8f582f14b077427df00 Mon Sep 17 00:00:00 2001
From: jjjzzzqqq1 <1791250016@qq.com>
Date: Tue, 21 Sep 2021 15:50:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=B8=AA=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=9C=89=E5=A4=9A=E4=B8=AA=E8=A7=92=E8=89=B2=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=8B=BC=E6=8E=A5=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E7=9A=84SQL=E7=94=B1=E4=BA=8E=E5=B8=A6=E6=9C=89OR=EF=BC=8C?=
 =?UTF-8?q?=E4=BD=BF=E5=BE=97MP=E6=96=B9=E6=B3=95=E6=B3=A8=E5=85=A5?=
 =?UTF-8?q?=E7=9A=84SQL=E5=85=B6=E4=BB=96Where=E6=9D=A1=E4=BB=B6=E5=A4=B1?=
 =?UTF-8?q?=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/framework/aspectj/DataScopeAspect.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
index a2c101e3d..bec1e05ad 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
@@ -127,7 +127,9 @@ public class DataScopeAspect {
 				}
 			}
 		}
-
+        //sql添加括号防止OR导致其他条件失效
+        sqlString.insert(4,"(");
+        sqlString.append(')');
 		if (StringUtils.isNotBlank(sqlString.toString())) {
 			putDataScope(joinPoint, sqlString.substring(4));
 		}