!18 数据权限基础

Merge pull request !18 from yangzhengze/master
master
yangzhengze 6 years ago committed by Limy
parent c49d46157c
commit 3e9c72781f

@ -576,4 +576,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('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 = '角色和部门关联表,用于数据权限';

@ -2,6 +2,8 @@ package com.ruoyi.project.system.dept.controller;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import com.ruoyi.project.system.role.domain.Role;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
@ -147,4 +149,14 @@ public class DeptController extends BaseController
List<Map<String, Object>> tree = deptService.selectDeptTree(); List<Map<String, Object>> tree = deptService.selectDeptTree();
return tree; return tree;
} }
/**
*
*/
@GetMapping("/roleDeptTreeData")
@ResponseBody
public List<Map<String, Object>> deptTreeData(Role role){
List<Map<String, Object>> tree = deptService.roleDeptTreeData(role);
return tree;
}
} }

@ -80,4 +80,12 @@ public interface DeptMapper
* @return * @return
*/ */
public Dept checkDeptNameUnique(String deptName); public Dept checkDeptNameUnique(String deptName);
/**
* ID
*
* @param roleId ID
* @return
*/
public List<String> selectRoleDeptTree(Long roleId);
} }

@ -4,6 +4,8 @@ import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import com.ruoyi.project.system.role.domain.Role;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.constant.UserConstants;
@ -55,8 +57,42 @@ public class DeptServiceImpl implements IDeptService
{ {
List<Map<String, Object>> trees = new ArrayList<Map<String, Object>>(); List<Map<String, Object>> trees = new ArrayList<Map<String, Object>>();
List<Dept> deptList = deptMapper.selectDeptAll(); List<Dept> deptList = deptMapper.selectDeptAll();
trees=getTrees(deptList,false,null);
return trees;
}
/**
* ID
*
* @param role
* @return
*/
@Override
public List<Map<String, Object>> roleDeptTreeData(Role role) {
Long roleId=role.getRoleId();
List<Map<String, Object>> trees = new ArrayList<Map<String, Object>>();
List<Dept> deptList=deptMapper.selectDeptAll();
if(StringUtils.isNotNull(roleId)){
List<String> roleDeptList=deptMapper.selectRoleDeptTree(roleId);
trees=getTrees(deptList,true,roleDeptList);
}else {
trees=getTrees(deptList,false,null);
}
return trees;
}
/**
*
*
* @param menuList
* @param isCheck
* @param roleDeptList
* @return
*/
public List<Map<String, Object>> getTrees(List<Dept> menuList, boolean isCheck, List<String> roleDeptList){
for (Dept dept : deptList) List<Map<String, Object>> trees = new ArrayList<Map<String, Object>>();
for (Dept dept : menuList)
{ {
if (UserConstants.DEPT_NORMAL.equals(dept.getStatus())) if (UserConstants.DEPT_NORMAL.equals(dept.getStatus()))
{ {
@ -65,12 +101,19 @@ public class DeptServiceImpl implements IDeptService
deptMap.put("pId", dept.getParentId()); deptMap.put("pId", dept.getParentId());
deptMap.put("name", dept.getDeptName()); deptMap.put("name", dept.getDeptName());
deptMap.put("title", dept.getDeptName()); deptMap.put("title", dept.getDeptName());
if (isCheck)
{
deptMap.put("checked", roleDeptList.contains(dept.getDeptId() + dept.getDeptName()));
}
else
{
deptMap.put("checked", false);
}
trees.add(deptMap); trees.add(deptMap);
} }
} }
return trees; return trees;
} }
/** /**
* *
* *

@ -4,6 +4,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import com.ruoyi.project.system.dept.domain.Dept; import com.ruoyi.project.system.dept.domain.Dept;
import com.ruoyi.project.system.role.domain.Role;
/** /**
* *
@ -34,6 +35,14 @@ public interface IDeptService
*/ */
public List<Map<String, Object>> selectDeptTree(); public List<Map<String, Object>> selectDeptTree();
/**
* ID
*
* @param role
* @return
*/
public List<Map<String, Object>> roleDeptTreeData(Role role);
/** /**
* *
* *

@ -118,8 +118,7 @@ public class MenuServiceImpl implements IMenuService
/** /**
* *
* *
* @param role
* @return * @return
*/ */
@Override @Override

@ -1,16 +1,5 @@
package com.ruoyi.project.system.role.controller; 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.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log; import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.constant.BusinessType; 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.framework.web.page.TableDataInfo;
import com.ruoyi.project.system.role.domain.Role; import com.ruoyi.project.system.role.domain.Role;
import com.ruoyi.project.system.role.service.IRoleService; 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;
/** /**
* *

@ -1,10 +1,10 @@
package com.ruoyi.project.system.role.domain; package com.ruoyi.project.system.role.domain;
import java.util.Arrays;
import com.ruoyi.framework.aspectj.lang.annotation.Excel; import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.framework.web.domain.BaseEntity; import com.ruoyi.framework.web.domain.BaseEntity;
import java.util.Arrays;
/** /**
* sys_role * sys_role
* *
@ -38,6 +38,8 @@ public class Role extends BaseEntity
private boolean flag = false; private boolean flag = false;
/** 菜单组 */ /** 菜单组 */
private Long[] menuIds; private Long[] menuIds;
/** 部门组(数据权限) */
private Long[] deptIds;
public Long getRoleId() public Long getRoleId()
{ {
@ -109,11 +111,19 @@ public class Role extends BaseEntity
this.menuIds = menuIds; this.menuIds = menuIds;
} }
public Long[] getDeptIds() {
return deptIds;
}
public void setDeptIds(Long[] deptIds) {
this.deptIds = deptIds;
}
@Override @Override
public String toString() public String toString()
{ {
return "Role [roleId=" + roleId + ", roleName=" + roleName + ", roleKey=" + roleKey + ", roleSort=" + roleSort return "Role [roleId=" + roleId + ", roleName=" + roleName + ", roleKey=" + roleKey + ", roleSort=" + roleSort
+ ", status=" + status + ", flag=" + flag + ", menuIds=" + Arrays.toString(menuIds) + "]"; + ", status=" + status + ", flag=" + flag + ", menuIds=" + Arrays.toString(menuIds) + ", deptIds=" + Arrays.toString(deptIds)+ "]";
} }
} }

@ -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 + "]";
}
}

@ -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);
}

@ -1,8 +1,9 @@
package com.ruoyi.project.system.role.service; package com.ruoyi.project.system.role.service;
import com.ruoyi.project.system.role.domain.Role;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import com.ruoyi.project.system.role.domain.Role;
/** /**
* *

@ -1,240 +1,271 @@
package com.ruoyi.project.system.role.service; package com.ruoyi.project.system.role.service;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import com.ruoyi.project.system.role.domain.RoleDept;
import com.ruoyi.common.constant.UserConstants; import com.ruoyi.project.system.role.mapper.RoleDeptMapper;
import com.ruoyi.common.support.Convert; import org.springframework.beans.factory.annotation.Autowired;
import com.ruoyi.common.utils.StringUtils; import org.springframework.stereotype.Service;
import com.ruoyi.common.utils.security.ShiroUtils; import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.project.system.role.domain.Role; import com.ruoyi.common.support.Convert;
import com.ruoyi.project.system.role.domain.RoleMenu; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.system.role.mapper.RoleMapper; import com.ruoyi.common.utils.security.ShiroUtils;
import com.ruoyi.project.system.role.mapper.RoleMenuMapper; import com.ruoyi.project.system.role.domain.Role;
import com.ruoyi.project.system.user.mapper.UserRoleMapper; import com.ruoyi.project.system.role.domain.RoleMenu;
import com.ruoyi.project.system.role.mapper.RoleMapper;
/** import com.ruoyi.project.system.role.mapper.RoleMenuMapper;
* import com.ruoyi.project.system.user.mapper.UserRoleMapper;
*
* @author ruoyi /**
*/ *
@Service *
public class RoleServiceImpl implements IRoleService * @author ruoyi
{ */
@Service
@Autowired public class RoleServiceImpl implements IRoleService
private RoleMapper roleMapper; {
@Autowired @Autowired
private RoleMenuMapper roleMenuMapper; private RoleMapper roleMapper;
@Autowired @Autowired
private UserRoleMapper userRoleMapper; private RoleMenuMapper roleMenuMapper;
/** @Autowired
* private UserRoleMapper userRoleMapper;
*
* @param role @Autowired
* @return private RoleDeptMapper roleDeptMapper;
*/
@Override /**
public List<Role> selectRoleList(Role role) *
{ *
return roleMapper.selectRoleList(role); * @param role
} * @return
*/
/** @Override
* ID public List<Role> selectRoleList(Role role)
* {
* @param userId ID return roleMapper.selectRoleList(role);
* @return }
*/
@Override /**
public Set<String> selectRoleKeys(Long userId) * ID
{ *
List<Role> perms = roleMapper.selectRolesByUserId(userId); * @param userId ID
Set<String> permsSet = new HashSet<>(); * @return
for (Role perm : perms) */
{ @Override
if (StringUtils.isNotNull(perms)) public Set<String> selectRoleKeys(Long userId)
{ {
permsSet.addAll(Arrays.asList(perm.getRoleKey().trim().split(","))); List<Role> perms = roleMapper.selectRolesByUserId(userId);
} Set<String> permsSet = new HashSet<>();
} for (Role perm : perms)
return permsSet; {
} if (StringUtils.isNotNull(perms))
{
/** permsSet.addAll(Arrays.asList(perm.getRoleKey().trim().split(",")));
* ID }
* }
* @param userId ID return permsSet;
* @return }
*/
@Override /**
public List<Role> selectRolesByUserId(Long userId) * ID
{ *
List<Role> userRoles = roleMapper.selectRolesByUserId(userId); * @param userId ID
List<Role> roles = roleMapper.selectRolesAll(); * @return
for (Role role : roles) */
{ @Override
for (Role userRole : userRoles) public List<Role> selectRolesByUserId(Long userId)
{ {
if (role.getRoleId() == userRole.getRoleId()) List<Role> userRoles = roleMapper.selectRolesByUserId(userId);
{ List<Role> roles = roleMapper.selectRolesAll();
role.setFlag(true); for (Role role : roles)
break; {
} for (Role userRole : userRoles)
} {
} if (role.getRoleId() == userRole.getRoleId())
return roles; {
} role.setFlag(true);
break;
/** }
* }
* }
* @return return roles;
*/ }
@Override
public List<Role> selectRoleAll() /**
{ *
return roleMapper.selectRolesAll(); *
} * @return
*/
/** @Override
* ID public List<Role> selectRoleAll()
* {
* @param roleId ID return roleMapper.selectRolesAll();
* @return }
*/
@Override /**
public Role selectRoleById(Long roleId) * ID
{ *
return roleMapper.selectRoleById(roleId); * @param roleId ID
} * @return
*/
/** @Override
* ID public Role selectRoleById(Long roleId)
* {
* @param roleId ID return roleMapper.selectRoleById(roleId);
* @return }
*/
@Override /**
public boolean deleteRoleById(Long roleId) * ID
{ *
return roleMapper.deleteRoleById(roleId) > 0 ? true : false; * @param roleId ID
} * @return
*/
/** @Override
* public boolean deleteRoleById(Long roleId)
* {
* @param ids ID return roleMapper.deleteRoleById(roleId) > 0 ? true : false;
* @throws Exception }
*/
@Override /**
public int deleteRoleByIds(String ids) throws Exception *
{ *
Long[] roleIds = Convert.toLongArray(ids); * @param ids ID
for (Long roleId : roleIds) * @throws Exception
{ */
Role role = selectRoleById(roleId); @Override
if (countUserRoleByRoleId(roleId) > 0) public int deleteRoleByIds(String ids) throws Exception
{ {
throw new Exception(String.format("%1$s已分配,不能删除", role.getRoleName())); Long[] roleIds = Convert.toLongArray(ids);
} for (Long roleId : roleIds)
} {
return roleMapper.deleteRoleByIds(roleIds); Role role = selectRoleById(roleId);
} if (countUserRoleByRoleId(roleId) > 0)
{
/** throw new Exception(String.format("%1$s已分配,不能删除", role.getRoleName()));
* }
* }
* @param role return roleMapper.deleteRoleByIds(roleIds);
* @return }
*/
@Override /**
public int insertRole(Role role) *
{ *
role.setCreateBy(ShiroUtils.getLoginName()); * @param role
// 新增角色信息 * @return
roleMapper.insertRole(role); */
ShiroUtils.clearCachedAuthorizationInfo(); @Override
return insertRoleMenu(role); public int insertRole(Role role)
} {
role.setCreateBy(ShiroUtils.getLoginName());
/** // 新增角色信息
* roleMapper.insertRole(role);
* ShiroUtils.clearCachedAuthorizationInfo();
* @param role //新增角色和部门信息(数据权限)
* @return insertRoleDept(role);
*/ return insertRoleMenu(role);
@Override }
public int updateRole(Role role)
{ /**
role.setUpdateBy(ShiroUtils.getLoginName()); *
// 修改角色信息 *
roleMapper.updateRole(role); * @param role
// 删除角色与菜单关联 * @return
roleMenuMapper.deleteRoleMenuByRoleId(role.getRoleId()); */
ShiroUtils.clearCachedAuthorizationInfo(); @Override
return insertRoleMenu(role); public int updateRole(Role role)
} {
role.setUpdateBy(ShiroUtils.getLoginName());
/** // 修改角色信息
* roleMapper.updateRole(role);
* // 删除角色与菜单关联
* @param user roleMenuMapper.deleteRoleMenuByRoleId(role.getRoleId());
*/ ShiroUtils.clearCachedAuthorizationInfo();
public int insertRoleMenu(Role role) //新增角色和部门信息(数据权限)
{ insertRoleDept(role);
int rows = 1; return insertRoleMenu(role);
// 新增用户与角色管理 }
List<RoleMenu> list = new ArrayList<RoleMenu>();
for (Long menuId : role.getMenuIds()) /**
{ *
RoleMenu rm = new RoleMenu(); *
rm.setRoleId(role.getRoleId()); * @param role
rm.setMenuId(menuId); */
list.add(rm); public int insertRoleMenu(Role role)
} {
if (list.size() > 0) int rows = 1;
{ // 新增用户与角色管理
rows = roleMenuMapper.batchRoleMenu(list); List<RoleMenu> list = new ArrayList<RoleMenu>();
} for (Long menuId : role.getMenuIds())
return rows; {
} RoleMenu rm = new RoleMenu();
rm.setRoleId(role.getRoleId());
/** rm.setMenuId(menuId);
* list.add(rm);
* }
* @param role if (list.size() > 0)
* @return {
*/ rows = roleMenuMapper.batchRoleMenu(list);
@Override }
public String checkRoleNameUnique(Role role) return rows;
{ }
Long roleId = StringUtils.isNull(role.getRoleId()) ? -1L : role.getRoleId();
Role info = roleMapper.checkRoleNameUnique(role.getRoleName()); /**
if (StringUtils.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue()) * ()
{ *
return UserConstants.ROLE_NAME_NOT_UNIQUE; * @param role
} */
return UserConstants.ROLE_NAME_UNIQUE; public void insertRoleDept(Role role)
} {
// 新增角色与部门(数据权限)管理
/** List<RoleDept> list = new ArrayList<RoleDept>();
* ID使 for (Long deptId : role.getDeptIds())
* {
* @param roleId ID RoleDept rd = new RoleDept();
* @return rd.setRoleId(role.getRoleId());
*/ rd.setDeptId(deptId);
@Override list.add(rd);
public int countUserRoleByRoleId(Long roleId) }
{ if (list.size() > 0)
return userRoleMapper.countUserRoleByRoleId(roleId); {
} roleDeptMapper.batchRoleDept(list);
}
} }
/**
*
*
* @param role
* @return
*/
@Override
public String checkRoleNameUnique(Role role)
{
Long roleId = StringUtils.isNull(role.getRoleId()) ? -1L : role.getRoleId();
Role info = roleMapper.checkRoleNameUnique(role.getRoleName());
if (StringUtils.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue())
{
return UserConstants.ROLE_NAME_NOT_UNIQUE;
}
return UserConstants.ROLE_NAME_UNIQUE;
}
/**
* ID使
*
* @param roleId ID
* @return
*/
@Override
public int countUserRoleByRoleId(Long roleId)
{
return userRoleMapper.countUserRoleByRoleId(roleId);
}
}

@ -24,6 +24,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select t.dept_id, t.parent_id, t.dept_name, t.order_num, t.leader, t.phone, t.email, t.status, t.create_by, t.create_time from sys_dept t select t.dept_id, t.parent_id, t.dept_name, t.order_num, t.leader, t.phone, t.email, t.status, t.create_by, t.create_time from sys_dept t
</sql> </sql>
<select id="selectRoleDeptTree" parameterType="Long" resultType="String">
select concat(d.dept_id, d.dept_name) as dept_name
from sys_dept d
left join sys_role_dept rd on d.dept_id = rd.dept_id
where rd.role_id = #{roleId}
order by d.parent_id, d.order_num
</select>
<select id="selectDeptAll" resultMap="DeptResult"> <select id="selectDeptAll" resultMap="DeptResult">
<include refid="selectDeptVo"/> <include refid="selectDeptVo"/>
</select> </select>

@ -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>

@ -48,6 +48,12 @@
<div id="menuTrees" class="ztree"></div> <div id="menuTrees" class="ztree"></div>
</div> </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-group">
<div class="form-control-static col-sm-offset-9"> <div class="form-control-static col-sm-offset-9">
<button type="submit" class="btn btn-primary">提交</button> <button type="submit" class="btn btn-primary">提交</button>
@ -76,6 +82,24 @@
menuTrees = $.fn.zTree.init($("#menuTrees"), setting, data); //.expandAll(true); menuTrees = $.fn.zTree.init($("#menuTrees"), setting, data); //.expandAll(true);
}, null, null, "正在加载,请稍后..."); }, null, null, "正在加载,请稍后...");
};loadTree(); };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({ $("#form-role-add").validate({
rules:{ rules:{
@ -115,17 +139,29 @@
}); });
function selectCheckeds() { 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() { function add() {
var roleName = $("input[name='roleName']").val(); var roleName = $("input[name='roleName']").val();
@ -134,6 +170,7 @@
var status = $("input[name='status']").is(':checked') == true ? 0 : 1; var status = $("input[name='status']").is(':checked') == true ? 0 : 1;
var remark = $("input[name='remark']").val(); var remark = $("input[name='remark']").val();
var menuIds = selectCheckeds(); var menuIds = selectCheckeds();
var deptIds = selectDeptCheckeds();
$.ajax({ $.ajax({
cache : true, cache : true,
type : "POST", type : "POST",
@ -144,7 +181,8 @@
"roleSort": roleSort, "roleSort": roleSort,
"status": status, "status": status,
"remark": remark, "remark": remark,
"menuIds": menuIds "menuIds": menuIds,
"deptIds":deptIds
}, },
async : false, async : false,
error : function(request) { error : function(request) {

@ -49,6 +49,12 @@
<div id="menuTrees" class="ztree"></div> <div id="menuTrees" class="ztree"></div>
</div> </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-group">
<div class="form-control-static col-sm-offset-9"> <div class="form-control-static col-sm-offset-9">
<button type="submit" class="btn btn-primary">提交</button> <button type="submit" class="btn btn-primary">提交</button>
@ -77,7 +83,25 @@
menuTrees = $.fn.zTree.init($("#menuTrees"), setting, data); //.expandAll(true); menuTrees = $.fn.zTree.init($("#menuTrees"), setting, data); //.expandAll(true);
}, null, null, "正在加载,请稍后..."); }, null, null, "正在加载,请稍后...");
};loadTree(); };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/roleDeptTreeData?roleId=" + $("#roleId").val(), function(data) {
deptTrees = $.fn.zTree.init($("#deptTrees"), deptsetting, data); //.expandAll(true);
}, null, null, "正在加载,请稍后...");
};loadTree();
$("#form-role-edit").validate({ $("#form-role-edit").validate({
rules:{ rules:{
roleName:{ roleName:{
@ -130,7 +154,20 @@
} }
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 edit() { function edit() {
var roleId = $("input[name='roleId']").val(); var roleId = $("input[name='roleId']").val();
var roleName = $("input[name='roleName']").val(); var roleName = $("input[name='roleName']").val();
@ -139,6 +176,7 @@
var status = $("input[name='status']").is(':checked') == true ? 0 : 1; var status = $("input[name='status']").is(':checked') == true ? 0 : 1;
var remark = $("input[name='remark']").val(); var remark = $("input[name='remark']").val();
var menuIds = selectCheckeds(); var menuIds = selectCheckeds();
var deptIds = selectDeptCheckeds();
$.ajax({ $.ajax({
cache : true, cache : true,
type : "POST", type : "POST",
@ -150,7 +188,8 @@
"roleSort": roleSort, "roleSort": roleSort,
"status": status, "status": status,
"remark": remark, "remark": remark,
"menuIds": menuIds "menuIds": menuIds,
"deptIds": deptIds
}, },
async : false, async : false,
error : function(request) { error : function(request) {

Loading…
Cancel
Save