From c83e7ecd6e5b698e59921f45b7d92acd7a9bc407 Mon Sep 17 00:00:00 2001
From: "Emil.Zhang" <tokyunhot@gmail.com>
Date: Fri, 11 Feb 2022 10:20:12 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E8=A7=A3=E5=86=B3=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E4=B8=8D=E6=98=8E=E7=A1=AE=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98):?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 当某个用户包含有 自定义，本级，全部 三个级别权限的角色时，只取最大 全部 级别的数据权限
2. 当不含 全部
级别时，将统一所有角色下的数据权限，并返回
---
 .../zhengjie/modules/system/service/impl/DataServiceImpl.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DataServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DataServiceImpl.java
index 33a81480..f2b3c79d 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DataServiceImpl.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DataServiceImpl.java
@@ -64,6 +64,9 @@ public class DataServiceImpl implements DataService {
                 case CUSTOMIZE:
                     deptIds.addAll(getCustomize(deptIds, role));
                     break;
+                case ALL:
+                    // 增加如果是数据权限包含有全部，则直接返回空
+                    return new ArrayList<>();
                 default:
                     return new ArrayList<>(deptIds);
             }