From 3ee655a8749a2c589c4c72193cb5a093af97167f Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Tue, 18 Jul 2023 23:49:05 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=908.0=E3=80=91=E3=80=90sys=E3=80=91?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=A7=92=E8=89=B2=E7=BB=91=E5=AE=9A=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=8C=83=E5=9B=B4=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SysRoleDataScopeServiceImpl.java    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/SysRoleDataScopeServiceImpl.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/SysRoleDataScopeServiceImpl.java
index ca27d8aff..aed515699 100644
--- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/SysRoleDataScopeServiceImpl.java
+++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/SysRoleDataScopeServiceImpl.java
@@ -107,6 +107,11 @@ public class SysRoleDataScopeServiceImpl extends ServiceImpl<SysRoleDataScopeMap
     @Transactional(rollbackFor = Exception.class)
     public void updateRoleBindDataScope(RoleBindDataScopeRequest roleBindDataScopeRequest) {
 
+        // 无论角色是否绑定的是指定部门，清空掉角色绑定的数据范围
+        LambdaQueryWrapper<SysRoleDataScope> removeWrapper = new LambdaQueryWrapper<>();
+        removeWrapper.eq(SysRoleDataScope::getRoleId, roleBindDataScopeRequest.getRoleId());
+        this.remove(removeWrapper);
+
         // 更新角色的数据权限类型
         Integer dataScopeType = roleBindDataScopeRequest.getDataScopeType();
         this.sysRoleService.updateRoleDataScopeType(roleBindDataScopeRequest.getRoleId(), dataScopeType);
@@ -122,11 +127,6 @@ public class SysRoleDataScopeServiceImpl extends ServiceImpl<SysRoleDataScopeMap
             return;
         }
 
-        // 先清空所有绑定，再添加所有绑定
-        LambdaQueryWrapper<SysRoleDataScope> removeWrapper = new LambdaQueryWrapper<>();
-        removeWrapper.eq(SysRoleDataScope::getRoleId, roleBindDataScopeRequest.getRoleId());
-        this.remove(removeWrapper);
-
         ArrayList<SysRoleDataScope> bindRoleDataScopeList = new ArrayList<>();
         for (Long orgId : orgIdList) {
             SysRoleDataScope sysRoleDataScope = new SysRoleDataScope();
@@ -140,7 +140,7 @@ public class SysRoleDataScopeServiceImpl extends ServiceImpl<SysRoleDataScopeMap
     @Override
     public Set<Long> getRoleBindOrgIdList(List<Long> roleIdList) {
 
-        if(ObjectUtil.isEmpty(roleIdList)){
+        if (ObjectUtil.isEmpty(roleIdList)) {
             return new HashSet<>();
         }