From a80dd168b05257384d04f279f97de22b018a5a29 Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Thu, 7 Mar 2019 22:46:30 +0800
Subject: [PATCH] :tada: 2.0.0.RC6

---
 .../system/controller/DeptController.java         |  6 ++++--
 .../system/controller/MenuController.java         |  5 ++---
 .../system/controller/RoleController.java         |  5 ++++-
 .../org/springblade/system/mapper/MenuMapper.java |  7 +++++++
 .../org/springblade/system/mapper/MenuMapper.xml  | 15 +++++++++++++++
 .../springblade/system/service/IMenuService.java  |  4 +++-
 .../system/service/impl/MenuServiceImpl.java      |  5 +++--
 7 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java
index 979480c8..91751615 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java
@@ -94,11 +94,13 @@ public class DeptController extends BladeController {
 	 */
 	@PostMapping("/submit")
 	@ApiOperation(value = "新增或修改", notes = "传入dept", position = 6)
-	public R submit(@Valid @RequestBody Dept dept) {
+	public R submit(@Valid @RequestBody Dept dept, BladeUser user) {
+		if (Func.isEmpty(dept.getId())) {
+			dept.setTenantCode(user.getTenantCode());
+		}
 		return R.status(deptService.saveOrUpdate(dept));
 	}
 
-
 	/**
 	 * 删除
 	 */
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/MenuController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/MenuController.java
index b2672818..7a62337a 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/MenuController.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/MenuController.java
@@ -113,8 +113,8 @@ public class MenuController extends BladeController {
 	 */
 	@GetMapping("/grant-tree")
 	@ApiOperation(value = "权限分配树形结构", notes = "权限分配树形结构", position = 6)
-	public R<List<MenuVO>> grantTree() {
-		return R.data(menuService.grantTree());
+	public R<List<MenuVO>> grantTree(BladeUser user) {
+		return R.data(menuService.grantTree(user));
 	}
 
 	/**
@@ -147,7 +147,6 @@ public class MenuController extends BladeController {
 
 	/**
 	 * 获取配置的角色权限
-	 * @return
 	 */
 	@GetMapping("auth-routes")
 	@ApiOperation(value = "菜单的角色权限", position = 8)
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/RoleController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/RoleController.java
index ea90e8a6..8fcc2c31 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/RoleController.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/RoleController.java
@@ -92,7 +92,10 @@ public class RoleController extends BladeController {
 	 */
 	@PostMapping("/submit")
 	@ApiOperation(value = "新增或修改", notes = "传入role", position = 6)
-	public R submit(@Valid @RequestBody Role role) {
+	public R submit(@Valid @RequestBody Role role, BladeUser user) {
+		if (Func.isEmpty(role.getId())) {
+			role.setTenantCode(user.getTenantCode());
+		}
 		return R.status(roleService.saveOrUpdate(role));
 	}
 
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.java b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.java
index daa0614a..11988509 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.java
@@ -54,6 +54,13 @@ public interface MenuMapper extends BaseMapper<Menu> {
 	 */
 	List<MenuVO> grantTree();
 
+	/**
+	 * 授权树形结构
+	 *
+	 * @return
+	 */
+	List<MenuVO> grantTreeByRole(List<Integer> roleId);
+
 	/**
 	 * 所有菜单
 	 *
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.xml
index c3a507f9..2d0d55f2 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.xml
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.xml
@@ -112,6 +112,21 @@
         select id, parent_id, name as title, id as 'value', id as 'key' from blade_menu where is_deleted = 0
     </select>
 
+    <select id="grantTreeByRole" resultMap="treeNodeResultMap">
+        select id, parent_id, name as title, id as 'value', id as 'key' from blade_menu where is_deleted = 0
+        and id in ( select menu_id from blade_role_menu where role_id in
+        <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach> )
+        or id in (
+        select parent_id from blade_menu where is_deleted = 0
+        and id in ( select menu_id from blade_role_menu where role_id in
+        <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach> )
+        )
+    </select>
+
     <select id="authRoutes" resultType="org.springblade.system.dto.MenuDTO">
         SELECT
             GROUP_CONCAT(r.role_alias) as alias,
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/IMenuService.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/IMenuService.java
index 9a5717b7..58006ef8 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/service/IMenuService.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/IMenuService.java
@@ -67,9 +67,10 @@ public interface IMenuService extends IService<Menu> {
 	/**
 	 * 授权树形结构
 	 *
+	 * @param user
 	 * @return
 	 */
-	List<MenuVO> grantTree();
+	List<MenuVO> grantTree(BladeUser user);
 
 	/**
 	 * 默认选中节点
@@ -81,6 +82,7 @@ public interface IMenuService extends IService<Menu> {
 
 	/**
 	 * 获取配置的角色权限
+	 *
 	 * @param user
 	 * @return
 	 */
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java
index 0cde7594..6e94ecd8 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java
@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
 import org.springblade.core.secure.BladeUser;
+import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.node.ForestNodeMerger;
 import org.springblade.core.tool.support.Kv;
 import org.springblade.core.tool.utils.Func;
@@ -86,8 +87,8 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
 	}
 
 	@Override
-	public List<MenuVO> grantTree() {
-		return ForestNodeMerger.merge(baseMapper.grantTree());
+	public List<MenuVO> grantTree(BladeUser user) {
+		return ForestNodeMerger.merge(user.getTenantCode().equals(BladeConstant.ADMIN_TENANT_CODE) ? baseMapper.grantTree() : baseMapper.grantTreeByRole(Func.toIntList(user.getRoleId())));
 	}
 
 	@Override