From cf6493a2a18e1f0b9caddf7bbaeb1c5e20e2784f Mon Sep 17 00:00:00 2001
From: yangzhengze <1403014932@qq.com>
Date: Sat, 28 Jul 2018 22:16:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E5=9F=BA?=
 =?UTF-8?q?=E7=A1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../role/controller/RoleController.java       | 19 ++++++++-----------
 .../project/system/role/domain/Role.java      |  4 ++--
 .../system/role/service/IRoleService.java     |  3 ++-
 .../system/role/service/RoleServiceImpl.java  |  2 ++
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/ruoyi/project/system/role/controller/RoleController.java b/src/main/java/com/ruoyi/project/system/role/controller/RoleController.java
index a05fbb45f..62bce3cbc 100644
--- a/src/main/java/com/ruoyi/project/system/role/controller/RoleController.java
+++ b/src/main/java/com/ruoyi/project/system/role/controller/RoleController.java
@@ -1,16 +1,5 @@
 package com.ruoyi.project.system.role.controller;
 
-import java.util.List;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.constant.BusinessType;
@@ -19,6 +8,14 @@ import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.system.role.domain.Role;
 import com.ruoyi.project.system.role.service.IRoleService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 角色信息
diff --git a/src/main/java/com/ruoyi/project/system/role/domain/Role.java b/src/main/java/com/ruoyi/project/system/role/domain/Role.java
index d02848a84..eb04ae74b 100644
--- a/src/main/java/com/ruoyi/project/system/role/domain/Role.java
+++ b/src/main/java/com/ruoyi/project/system/role/domain/Role.java
@@ -1,10 +1,10 @@
 package com.ruoyi.project.system.role.domain;
 
-import java.util.Arrays;
-
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 
+import java.util.Arrays;
+
 /**
  * 角色对象 sys_role
  * 
diff --git a/src/main/java/com/ruoyi/project/system/role/service/IRoleService.java b/src/main/java/com/ruoyi/project/system/role/service/IRoleService.java
index 02c6ccca5..b0dee272f 100644
--- a/src/main/java/com/ruoyi/project/system/role/service/IRoleService.java
+++ b/src/main/java/com/ruoyi/project/system/role/service/IRoleService.java
@@ -1,8 +1,9 @@
 package com.ruoyi.project.system.role.service;
 
+import com.ruoyi.project.system.role.domain.Role;
+
 import java.util.List;
 import java.util.Set;
-import com.ruoyi.project.system.role.domain.Role;
 
 /**
  * 角色业务层
diff --git a/src/main/java/com/ruoyi/project/system/role/service/RoleServiceImpl.java b/src/main/java/com/ruoyi/project/system/role/service/RoleServiceImpl.java
index 4eb45a315..e46a0a3e5 100644
--- a/src/main/java/com/ruoyi/project/system/role/service/RoleServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/system/role/service/RoleServiceImpl.java
@@ -168,6 +168,8 @@ public class RoleServiceImpl implements IRoleService
         // 新增角色信息
         roleMapper.insertRole(role);
         ShiroUtils.clearCachedAuthorizationInfo();
+        //新增角色和部门信息（数据权限）
+        insertRoleDept(role);
         return insertRoleMenu(role);
     }