From 6c6d51a4d20e14cc541953f849b38c09836ccac8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=98=BF=E6=B2=90?= <babamu@126.com>
Date: Sat, 23 Jul 2022 17:12:00 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E8=A7=92=E8=89=B2=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=EF=BC=8C=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E6=9B=B4?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../maku/system/controller/SysRoleController.java  | 10 +++++++
 .../net/maku/system/service/SysRoleService.java    |  3 +++
 .../system/service/impl/SysRoleServiceImpl.java    | 22 +++++++++++----
 .../net/maku/system/vo/SysRoleDataScopeVO.java     | 31 ++++++++++++++++++++++
 4 files changed, 61 insertions(+), 5 deletions(-)
 create mode 100644 fast-boot-system/src/main/java/net/maku/system/vo/SysRoleDataScopeVO.java

diff --git a/fast-boot-system/src/main/java/net/maku/system/controller/SysRoleController.java b/fast-boot-system/src/main/java/net/maku/system/controller/SysRoleController.java
index c18618f..0608e6e 100644
--- a/fast-boot-system/src/main/java/net/maku/system/controller/SysRoleController.java
+++ b/fast-boot-system/src/main/java/net/maku/system/controller/SysRoleController.java
@@ -15,6 +15,7 @@ import net.maku.system.service.SysRoleMenuService;
 import net.maku.system.service.SysRoleService;
 import net.maku.system.vo.SysMenuVO;
 import net.maku.system.query.SysRoleQuery;
+import net.maku.system.vo.SysRoleDataScopeVO;
 import net.maku.system.vo.SysRoleVO;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -93,6 +94,15 @@ public class SysRoleController {
 		return Result.ok();
 	}
 
+	@PutMapping("data-scope")
+	@Operation(summary = "数据权限")
+	@PreAuthorize("hasAuthority('sys:role:update')")
+	public Result<String> dataScope(@RequestBody @Valid SysRoleDataScopeVO vo){
+		sysRoleService.dataScope(vo);
+
+		return Result.ok();
+	}
+
 	@DeleteMapping
 	@Operation(summary = "删除")
 	@PreAuthorize("hasAuthority('sys:role:delete')")
diff --git a/fast-boot-system/src/main/java/net/maku/system/service/SysRoleService.java b/fast-boot-system/src/main/java/net/maku/system/service/SysRoleService.java
index a8ec4f7..969886a 100644
--- a/fast-boot-system/src/main/java/net/maku/system/service/SysRoleService.java
+++ b/fast-boot-system/src/main/java/net/maku/system/service/SysRoleService.java
@@ -4,6 +4,7 @@ import net.maku.framework.common.page.PageResult;
 import net.maku.framework.common.service.BaseService;
 import net.maku.system.entity.SysRoleEntity;
 import net.maku.system.query.SysRoleQuery;
+import net.maku.system.vo.SysRoleDataScopeVO;
 import net.maku.system.vo.SysRoleVO;
 
 import java.util.List;
@@ -23,5 +24,7 @@ public interface SysRoleService extends BaseService<SysRoleEntity> {
 
 	void update(SysRoleVO vo);
 
+	void dataScope(SysRoleDataScopeVO vo);
+
 	void delete(List<Long> idList);
 }
diff --git a/fast-boot-system/src/main/java/net/maku/system/service/impl/SysRoleServiceImpl.java b/fast-boot-system/src/main/java/net/maku/system/service/impl/SysRoleServiceImpl.java
index 31fb1d2..420e9aa 100644
--- a/fast-boot-system/src/main/java/net/maku/system/service/impl/SysRoleServiceImpl.java
+++ b/fast-boot-system/src/main/java/net/maku/system/service/impl/SysRoleServiceImpl.java
@@ -15,10 +15,12 @@ import net.maku.system.service.SysRoleMenuService;
 import net.maku.system.service.SysRoleService;
 import net.maku.system.service.SysUserRoleService;
 import net.maku.system.query.SysRoleQuery;
+import net.maku.system.vo.SysRoleDataScopeVO;
 import net.maku.system.vo.SysRoleVO;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -63,14 +65,11 @@ public class SysRoleServiceImpl extends BaseServiceImpl<SysRoleDao, SysRoleEntit
 		SysRoleEntity entity = SysRoleConvert.INSTANCE.convert(vo);
 
 		// 保存角色
-		entity.setDataScope(DataScopeEnum.CUSTOM.getValue());
+		entity.setDataScope(DataScopeEnum.SELF.getValue());
 		baseMapper.insert(entity);
 
 		// 保存角色菜单关系
 		sysRoleMenuService.saveOrUpdate(entity.getId(), vo.getMenuIdList());
-
-		// 保存角色数据权限关系
-		sysRoleDataScopeService.saveOrUpdate(entity.getId(), vo.getOrgIdList());
 	}
 
 	@Override
@@ -83,9 +82,22 @@ public class SysRoleServiceImpl extends BaseServiceImpl<SysRoleDao, SysRoleEntit
 
 		// 更新角色菜单关系
 		sysRoleMenuService.saveOrUpdate(entity.getId(), vo.getMenuIdList());
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void dataScope(SysRoleDataScopeVO vo) {
+		SysRoleEntity entity = getById(vo.getId());
+		entity.setDataScope(vo.getDataScope());
+		// 更新角色
+		updateById(entity);
 
 		// 更新角色数据权限关系
-		sysRoleDataScopeService.saveOrUpdate(entity.getId(), vo.getOrgIdList());
+		if(vo.getDataScope().equals(DataScopeEnum.CUSTOM.getValue())){
+			sysRoleDataScopeService.saveOrUpdate(entity.getId(), vo.getOrgIdList());
+		}else {
+			sysRoleDataScopeService.deleteByRoleIdList(Collections.singletonList(vo.getId()));
+		}
 	}
 
 	@Override
diff --git a/fast-boot-system/src/main/java/net/maku/system/vo/SysRoleDataScopeVO.java b/fast-boot-system/src/main/java/net/maku/system/vo/SysRoleDataScopeVO.java
new file mode 100644
index 0000000..48b62d6
--- /dev/null
+++ b/fast-boot-system/src/main/java/net/maku/system/vo/SysRoleDataScopeVO.java
@@ -0,0 +1,31 @@
+package net.maku.system.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 角色数据权限
+ *
+ * @author 阿沐 babamu@126.com
+ */
+@Data
+@Schema(description = "角色数据权限")
+public class SysRoleDataScopeVO implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	@Schema(description = "id")
+	@NotNull(message = "角色ID不能为空")
+	private Long id;
+
+	@Schema(description = "数据范围  0：全部数据  1：本部门及子部门数据  2：本部门数据  3：本人数据  4：自定义数据")
+	@NotNull(message = "数据范围不能为空")
+	private Integer dataScope;
+
+	@Schema(description = "机构ID列表")
+	private List<Long> orgIdList;
+
+}
\ No newline at end of file