新增数据权限基础

sql/ry_20180709.sql

@@ -594,4 +594,14 @@ create table sys_notice (
 -- 初始化-公告信息表数据
 -- ----------------------------
 insert into sys_notice values('1', '温馨提醒：2018-07-01 若依新版本发布啦', '2', '新版本内容', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '管理员');
-insert into sys_notice values('2', '维护通知：2018-07-01 若依系统凌晨维护', '1', '维护内容',   '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '管理员');
+insert into sys_notice values('2', '维护通知：2018-07-01 若依系统凌晨维护', '1', '维护内容',   '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '管理员');
+
+-- ----------------------------
+-- 18、角色和部门关联表  角色1-N部门（用于数据权限）
+-- ----------------------------
+drop table if exists sys_role_dept;
+create table sys_role_dept (
+  role_id 	int(11) not null comment '角色ID',
+  dept_id 	int(11) not null comment '部门ID',
+  primary key(role_id, dept_id)
+) engine=innodb default charset=utf8 comment = '角色和部门关联表，用于数据权限';

src/main/java/com/ruoyi/project/system/role/domain/RoleDept.java

@@ -0,0 +1,32 @@
+package com.ruoyi.project.system.role.domain;
+
+/**
+ * 角色和部门关联 sys_role_dept
+ */
+public class RoleDept {
+    /** 角色ID */
+    private Long roleId;
+    /** 部门ID */
+    private Long deptId;
+
+    public Long getRoleId() {
+        return roleId;
+    }
+
+    public void setRoleId(Long roleId) {
+        this.roleId = roleId;
+    }
+
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
+    @Override
+    public String toString()
+    {
+        return "RoleDept [roleId=" + roleId + ", deptId=" + deptId + "]";
+    }
+}

src/main/java/com/ruoyi/project/system/role/mapper/RoleDeptMapper.java

@@ -0,0 +1,43 @@
+package com.ruoyi.project.system.role.mapper;
+
+import com.ruoyi.project.system.role.domain.RoleDept;
+
+import java.util.List;
+
+/**
+ * 角色与部门关联表(用于数据权限) 数据层
+ */
+public interface RoleDeptMapper {
+    /**
+     * 通过角色ID删除角色和部门关联
+     *
+     * @param roleId 角色ID
+     * @return 结果
+     */
+    public int deleteRoleDeptByRoleId(Long roleId);
+
+    /**
+     * 批量删除角色部门关联信息
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteRoleDept(Long[] ids);
+
+    /**
+     * 查询部门使用数量
+     *
+     * @param detpId 部门ID
+     * @return 结果
+     */
+    public int selectCountRoleDeptByDetpId(Long detpId);
+
+    /**
+     * 批量新增角色部门信息（数据权限）
+     *
+     * @param roleDeptList 角色菜单列表
+     * @return 结果
+     */
+    public int batchRoleDept(List<RoleDept> roleDeptList);
+
+}

src/main/resources/mybatis/system/RoleDeptMapper.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.project.system.role.mapper.RoleDeptMapper">
+
+	<resultMap type="RoleDept" id="RoleDeptResult">
+		<result property="roleId"     column="role_id"      />
+		<result property="deptId"     column="dept_id"      />
+	</resultMap>
+
+	<delete id="deleteRoleDeptByRoleId" parameterType="Long">
+		delete from sys_role_dept where role_id=#{roleId}
+	</delete>
+	
+	<select id="selectCountRoleDeptByDetpId" resultType="Integer">
+	    select count(*) from sys_role_dept where dept_id=#{detpId}
+	</select>
+	
+	<delete id="deleteRoleDept" parameterType="Long">
+ 		delete from sys_role_dept where role_id in
+ 		<foreach collection="array" item="roleId" open="(" separator="," close=")">
+ 			#{roleId}
+        </foreach> 
+ 	</delete>
+	
+	<insert id="batchRoleDept">
+		insert into sys_role_dept(role_id, dept_id) values
+		<foreach item="item" index="index" collection="list" separator=",">
+			(#{item.roleId},#{item.deptId})
+		</foreach>
+	</insert>
+	
+</mapper> 

src/main/resources/templates/system/role/add.html

@@ -48,6 +48,12 @@
 					<div id="menuTrees" class="ztree"></div>
 				</div>
 			</div>
+			<div class="form-group">
+				<label class="col-sm-3 control-label">数据权限</label>
+				<div class="col-sm-8">
+					<div id="deptTrees" class="ztree"></div>
+				</div>
+			</div>
 			<div class="form-group">
 				<div class="form-control-static col-sm-offset-9">
 					<button type="submit" class="btn btn-primary">提交</button>
@@ -76,6 +82,24 @@
 				menuTrees = $.fn.zTree.init($("#menuTrees"), setting, data); //.expandAll(true);
 			}, null, null, "正在加载，请稍后...");
 		};loadTree();
+
+        // 权限树结构初始化加载
+        var deptsetting = {
+            check:{enable:true,nocheckInherit:true,chkboxType:{"Y":"ps","N":"ps"}},
+            view:{selectedMulti:false,nameIsHTML: true},
+            data:{simpleData:{enable:true},key:{title:"title"}},
+            callback:{
+                beforeClick: function (treeId, treeNode, clickFlag) {
+                    var deptTrees = $.fn.zTree.getZTreeObj(treeId);
+                    deptTrees.checkNode(treeNode, !treeNode.checked, true, true);
+                    return false;
+                }
+            }
+        }, deptTrees, loadTree = function(){
+            $.get(ctx + "system/dept/treeData", function(data) {
+                deptTrees = $.fn.zTree.init($("#deptTrees"), deptsetting, data); //.expandAll(true);
+            }, null, null, "正在加载，请稍后...");
+        };loadTree();
 	
 		$("#form-role-add").validate({
 			rules:{
@@ -115,17 +139,29 @@
 		});
 	
 		function selectCheckeds() {
-		    var menuIds = "";
+            var menuIds = "";
-		    var treeNodes = menuTrees.getCheckedNodes(true);
+            var treeNodes = menuTrees.getCheckedNodes(true);
-		    for (var i = 0; i < treeNodes.length; i++) {
+            for (var i = 0; i < treeNodes.length; i++) {
-		        if (0 == i) {
+                if (0 == i) {
-		        	menuIds = treeNodes[i].id;
+                    menuIds = treeNodes[i].id;
-		        } else {
+                } else {
-		        	menuIds += ("," + treeNodes[i].id);
+                    menuIds += ("," + treeNodes[i].id);
-		        }
+                }
-		    }
+            }
-		    return menuIds;
+            return menuIds;
-		}
+        }
+        function selectDeptCheckeds() {
+            var deptIds = "";
+            var treeNodes = deptTrees.getCheckedNodes(true);
+            for (var i = 0; i < treeNodes.length; i++) {
+                if (0 == i) {
+                    deptIds = treeNodes[i].id;
+                } else {
+                    deptIds += ("," + treeNodes[i].id);
+                }
+            }
+            return deptIds;
+        }
 	
 		function add() {
 			var roleName = $("input[name='roleName']").val();
@@ -134,6 +170,7 @@
 			var status = $("input[name='status']").is(':checked') == true ? 0 : 1;
 			var remark = $("input[name='remark']").val();
 			var menuIds = selectCheckeds();
+			var deptIds = selectDeptCheckeds();
 			$.ajax({
 				cache : true,
 				type : "POST",
@@ -144,7 +181,8 @@
 					"roleSort": roleSort,
 					"status": status,
 					"remark": remark,
-					"menuIds": menuIds
+					"menuIds": menuIds,
+					"deptIds":deptIds
 				},
 				async : false,
 				error : function(request) {