From e916d0dfb264db6a860cf066db9e31bee92a93d4 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Tue, 26 Jul 2022 20:00:10 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9D=83=E9=99=90=E4=B8=8D=E6=8E=92=E9=99=A4=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ruoyi/common/exception/GlobalException.java | 2 +- .../java/com/ruoyi/common/exception/ServiceException.java | 1 + .../java/com/ruoyi/framework/aspectj/DataScopeAspect.java | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/ruoyi/common/exception/GlobalException.java b/src/main/java/com/ruoyi/common/exception/GlobalException.java index 318b9ae..9f0dec4 100644 --- a/src/main/java/com/ruoyi/common/exception/GlobalException.java +++ b/src/main/java/com/ruoyi/common/exception/GlobalException.java @@ -7,7 +7,6 @@ package com.ruoyi.common.exception; */ public class GlobalException extends RuntimeException { - private static final long serialVersionUID = 1L; /** @@ -45,6 +44,7 @@ public class GlobalException extends RuntimeException return this; } + @Override public String getMessage() { return message; diff --git a/src/main/java/com/ruoyi/common/exception/ServiceException.java b/src/main/java/com/ruoyi/common/exception/ServiceException.java index 734e8fc..a9247b5 100644 --- a/src/main/java/com/ruoyi/common/exception/ServiceException.java +++ b/src/main/java/com/ruoyi/common/exception/ServiceException.java @@ -49,6 +49,7 @@ public final class ServiceException extends RuntimeException return detailMessage; } + @Override public String getMessage() { return message; diff --git a/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java b/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java index 684a1a4..9e0caea 100644 --- a/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java +++ b/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java @@ -92,7 +92,7 @@ public class DataScopeAspect for (SysRole role : user.getRoles()) { String dataScope = role.getDataScope(); - if (conditions.contains(dataScope)) + if (!DATA_SCOPE_CUSTOM.equals(dataScope) && conditions.contains(dataScope)) { continue; } @@ -114,7 +114,7 @@ public class DataScopeAspect else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope)) { sqlString.append(StringUtils.format( - " OR {}.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set({}, ancestors) > 0 )", + " OR {}.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )", deptAlias, user.getDeptId(), user.getDeptId())); } else if (DATA_SCOPE_SELF.equals(dataScope))