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

调整系级描述

This commit is contained in:
wrui 2019-06-14 15:12:10 +08:00
parent 66233446cf
commit 7511ffa153
3 changed files with 111 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

233
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
View File

@ -22,145 +22,130 @@ import com.ruoyi.system.domain.SysRole;
import com.ruoyi.system.service.ISysDeptService; import com.ruoyi.system.service.ISysDeptService;
/** /**
* 部门信息 * 系级信息
* *
* @author ruoyi * @author ruoyi
*/ */
@Controller @Controller
@RequestMapping("/system/dept") @RequestMapping("/system/dept")
public class SysDeptController extends BaseController public class SysDeptController extends BaseController {
{ private String prefix = "system/dept";
private String prefix = "system/dept";
@Autowired @Autowired
private ISysDeptService deptService; private ISysDeptService deptService;
@RequiresPermissions("system:dept:view") @RequiresPermissions("system:dept:view")
@GetMapping() @GetMapping()
public String dept() public String dept() {
{ return prefix + "/dept";
return prefix + "/dept"; }
}
@RequiresPermissions("system:dept:list") @RequiresPermissions("system:dept:list")
@GetMapping("/list") @GetMapping("/list")
@ResponseBody @ResponseBody
public List<SysDept> list(SysDept dept) public List<SysDept> list(SysDept dept) {
{ List<SysDept> deptList = deptService.selectDeptList(dept);
List<SysDept> deptList = deptService.selectDeptList(dept); return deptList;
return deptList; }
}
/** /**
* 新增部门 * 新增系级
*/ */
@GetMapping("/add/{parentId}") @GetMapping("/add/{parentId}")
public String add(@PathVariable("parentId") Long parentId, ModelMap mmap) public String add(@PathVariable("parentId") Long parentId, ModelMap mmap) {
{ mmap.put("dept", deptService.selectDeptById(parentId));
mmap.put("dept", deptService.selectDeptById(parentId)); return prefix + "/add";
return prefix + "/add"; }
}
/** /**
* 新增保存部门 * 新增保存系级
*/ */
@Log(title = "部门管理", businessType = BusinessType.INSERT) @Log(title = "系级管理", businessType = BusinessType.INSERT)
@RequiresPermissions("system:dept:add") @RequiresPermissions("system:dept:add")
@PostMapping("/add") @PostMapping("/add")
@ResponseBody @ResponseBody
public AjaxResult addSave(SysDept dept) public AjaxResult addSave(SysDept dept) {
{ dept.setCreateBy(ShiroUtils.getLoginName());
dept.setCreateBy(ShiroUtils.getLoginName()); return toAjax(deptService.insertDept(dept));
return toAjax(deptService.insertDept(dept)); }
}
/** /**
* 修改 * 修改
*/ */
@GetMapping("/edit/{deptId}") @GetMapping("/edit/{deptId}")
public String edit(@PathVariable("deptId") Long deptId, ModelMap mmap) public String edit(@PathVariable("deptId") Long deptId, ModelMap mmap) {
{ SysDept dept = deptService.selectDeptById(deptId);
SysDept dept = deptService.selectDeptById(deptId); if (StringUtils.isNotNull(dept) && 100L == deptId) {
if (StringUtils.isNotNull(dept) && 100L == deptId) dept.setParentName("无");
{ }
dept.setParentName("无"); mmap.put("dept", dept);
} return prefix + "/edit";
mmap.put("dept", dept); }
return prefix + "/edit";
}
/** /**
* 保存 * 保存
*/ */
@Log(title = "部门管理", businessType = BusinessType.UPDATE) @Log(title = "系级管理", businessType = BusinessType.UPDATE)
@RequiresPermissions("system:dept:edit") @RequiresPermissions("system:dept:edit")
@PostMapping("/edit") @PostMapping("/edit")
@ResponseBody @ResponseBody
public AjaxResult editSave(SysDept dept) public AjaxResult editSave(SysDept dept) {
{ dept.setUpdateBy(ShiroUtils.getLoginName());
dept.setUpdateBy(ShiroUtils.getLoginName()); return toAjax(deptService.updateDept(dept));
return toAjax(deptService.updateDept(dept)); }
}
/** /**
* 删除 * 删除
*/ */
@Log(title = "部门管理", businessType = BusinessType.DELETE) @Log(title = "系级管理", businessType = BusinessType.DELETE)
@RequiresPermissions("system:dept:remove") @RequiresPermissions("system:dept:remove")
@GetMapping("/remove/{deptId}") @GetMapping("/remove/{deptId}")
@ResponseBody @ResponseBody
public AjaxResult remove(@PathVariable("deptId") Long deptId) public AjaxResult remove(@PathVariable("deptId") Long deptId) {
{ if (deptService.selectDeptCount(deptId) > 0) {
if (deptService.selectDeptCount(deptId) > 0) return AjaxResult.warn("存在下级系级,不允许删除");
{ }
return AjaxResult.warn("存在下级部门,不允许删除"); if (deptService.checkDeptExistUser(deptId)) {
} return AjaxResult.warn("系级存在用户,不允许删除");
if (deptService.checkDeptExistUser(deptId)) }
{ return toAjax(deptService.deleteDeptById(deptId));
return AjaxResult.warn("部门存在用户,不允许删除"); }
}
return toAjax(deptService.deleteDeptById(deptId));
}
/** /**
* 校验部门名称 * 校验系级名称
*/ */
@PostMapping("/checkDeptNameUnique") @PostMapping("/checkDeptNameUnique")
@ResponseBody @ResponseBody
public String checkDeptNameUnique(SysDept dept) public String checkDeptNameUnique(SysDept dept) {
{ return deptService.checkDeptNameUnique(dept);
return deptService.checkDeptNameUnique(dept); }
}
/** /**
* 选择部门树 * 选择系级树
*/ */
@GetMapping("/selectDeptTree/{deptId}") @GetMapping("/selectDeptTree/{deptId}")
public String selectDeptTree(@PathVariable("deptId") Long deptId, ModelMap mmap) public String selectDeptTree(@PathVariable("deptId") Long deptId, ModelMap mmap) {
{ mmap.put("dept", deptService.selectDeptById(deptId));
mmap.put("dept", deptService.selectDeptById(deptId)); return prefix + "/tree";
return prefix + "/tree"; }
}
/** /**
* 加载部门列表树 * 加载系级列表树
*/ */
@GetMapping("/treeData") @GetMapping("/treeData")
@ResponseBody @ResponseBody
public List<Ztree> treeData() public List<Ztree> treeData() {
{ List<Ztree> ztrees = deptService.selectDeptTree(new SysDept());
List<Ztree> ztrees = deptService.selectDeptTree(new SysDept()); return ztrees;
return ztrees; }
}
/** /**
* 加载角色部门（数据权限）列表树 * 加载角色系级（数据权限）列表树
*/ */
@GetMapping("/roleDeptTreeData") @GetMapping("/roleDeptTreeData")
@ResponseBody @ResponseBody
public List<Ztree> deptTreeData(SysRole role) public List<Ztree> deptTreeData(SysRole role) {
{ List<Ztree> ztrees = deptService.roleDeptTreeData(role);
List<Ztree> ztrees = deptService.roleDeptTreeData(role); return ztrees;
return ztrees; }
}
} }

2
ruoyi-admin/src/main/resources/templates/system/dept/add.html
View File

@ -8,7 +8,7 @@
<form class="form-horizontal m" id="form-dept-add"> <form class="form-horizontal m" id="form-dept-add">
<input id="treeId" name="parentId" type="hidden" th:value="${dept.deptId}" /> <input id="treeId" name="parentId" type="hidden" th:value="${dept.deptId}" />
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label ">上级：</label> <label class="col-sm-3 control-label ">所属系级：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<div class="input-group"> <div class="input-group">
<input class="form-control" type="text" onclick="selectDeptTree()" id="treeName" readonly="true" th:value="${dept.deptName}"> <input class="form-control" type="text" onclick="selectDeptTree()" id="treeName" readonly="true" th:value="${dept.deptName}">

2
ruoyi-admin/src/main/resources/templates/system/dept/edit.html
View File

@ -9,7 +9,7 @@
<input name="deptId" type="hidden" th:field="*{deptId}" /> <input name="deptId" type="hidden" th:field="*{deptId}" />
<input id="treeId" name="parentId" type="hidden" th:field="*{parentId}" /> <input id="treeId" name="parentId" type="hidden" th:field="*{parentId}" />
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label ">上级：</label> <label class="col-sm-3 control-label ">所属系级：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<div class="input-group"> <div class="input-group">
<input class="form-control" type="text" id="treeName" onclick="selectDeptTree()" readonly="true" th:field="*{parentName}"> <input class="form-control" type="text" id="treeName" onclick="selectDeptTree()" readonly="true" th:field="*{parentName}">