hhyykk/RuoYi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reset

Browse Source
This commit is contained in:
RuoYi
2018-07-29 17:04:32 +08:00
parent 2401c5552e
commit f6f8c0b03a
17 changed files with 41 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/resources/mybatis/system/DeptMapper.xml
View File

@ -24,14 +24,6 @@ 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
</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">
<include refid="selectDeptVo"/>
</select>

34
src/main/resources/mybatis/system/RoleDeptMapper.xml
View File

@ -1,34 +0,0 @@
<?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>

8
src/main/resources/templates/system/post/post.html
View File

@ -33,12 +33,12 @@
</div>
<div class="btn-group hidden-xs" id="toolbar" role="group">
<button class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="system:post:add">
<a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="system:post:add">
<i class="fa fa-plus"></i> 新增
</button>
<button class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="system:post:remove">
</a>
<a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="system:post:remove">
<i class="fa fa-trash-o"></i> 删除
</button>
</a>
</div>
<div class="col-sm-12 select-info table-striped">

62
src/main/resources/templates/system/role/add.html
View File

@ -48,12 +48,6 @@
<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>
@ -82,24 +76,6 @@
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:{
@ -139,29 +115,17 @@
});
function selectCheckeds() {
var menuIds = "";
var treeNodes = menuTrees.getCheckedNodes(true);
for (var i = 0; i < treeNodes.length; i++) {
if (0 == i) {
menuIds = treeNodes[i].id;
} else {
menuIds += ("," + treeNodes[i].id);
}
}
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;
}
var menuIds = "";
var treeNodes = menuTrees.getCheckedNodes(true);
for (var i = 0; i < treeNodes.length; i++) {
if (0 == i) {
menuIds = treeNodes[i].id;
} else {
menuIds += ("," + treeNodes[i].id);
}
}
return menuIds;
}
function add() {
var roleName = $("input[name='roleName']").val();
@ -170,7 +134,6 @@
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",
@ -181,8 +144,7 @@
"roleSort": roleSort,
"status": status,
"remark": remark,
"menuIds": menuIds,
"deptIds":deptIds
"menuIds": menuIds
},
async : false,
error : function(request) {

45
src/main/resources/templates/system/role/edit.html
View File

@ -49,12 +49,6 @@
<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>
@ -83,25 +77,7 @@
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/roleDeptTreeData?roleId=" + $("#roleId").val(), function(data) {
deptTrees = $.fn.zTree.init($("#deptTrees"), deptsetting, data); //.expandAll(true);
}, null, null, "正在加载，请稍后...");
};loadTree();
$("#form-role-edit").validate({
rules:{
roleName:{
@ -154,20 +130,7 @@
}
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() {
var roleId = $("input[name='roleId']").val();
var roleName = $("input[name='roleName']").val();
@ -176,7 +139,6 @@
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",
@ -188,8 +150,7 @@
"roleSort": roleSort,
"status": status,
"remark": remark,
"menuIds": menuIds,
"deptIds": deptIds
"menuIds": menuIds
},
async : false,
error : function(request) {