|
@@ -1,18 +1,5 @@
|
|
package com.ruoyi.web.controller.system;
|
|
package com.ruoyi.web.controller.system;
|
|
|
|
|
|
-import java.util.List;
|
|
|
|
-import org.apache.commons.lang3.ArrayUtils;
|
|
|
|
-import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
-import org.springframework.security.access.prepost.PreAuthorize;
|
|
|
|
-import org.springframework.validation.annotation.Validated;
|
|
|
|
-import org.springframework.web.bind.annotation.DeleteMapping;
|
|
|
|
-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.PutMapping;
|
|
|
|
-import org.springframework.web.bind.annotation.RequestBody;
|
|
|
|
-import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
|
-import org.springframework.web.bind.annotation.RestController;
|
|
|
|
import com.ruoyi.common.annotation.Log;
|
|
import com.ruoyi.common.annotation.Log;
|
|
import com.ruoyi.common.constant.UserConstants;
|
|
import com.ruoyi.common.constant.UserConstants;
|
|
import com.ruoyi.common.core.controller.BaseController;
|
|
import com.ruoyi.common.core.controller.BaseController;
|
|
@@ -21,16 +8,22 @@ import com.ruoyi.common.core.domain.entity.SysDept;
|
|
import com.ruoyi.common.enums.BusinessType;
|
|
import com.ruoyi.common.enums.BusinessType;
|
|
import com.ruoyi.common.utils.StringUtils;
|
|
import com.ruoyi.common.utils.StringUtils;
|
|
import com.ruoyi.system.service.ISysDeptService;
|
|
import com.ruoyi.system.service.ISysDeptService;
|
|
|
|
+import org.apache.commons.lang3.ArrayUtils;
|
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
+import org.springframework.security.access.prepost.PreAuthorize;
|
|
|
|
+import org.springframework.validation.annotation.Validated;
|
|
|
|
+import org.springframework.web.bind.annotation.*;
|
|
|
|
+
|
|
|
|
+import java.util.List;
|
|
|
|
|
|
/**
|
|
/**
|
|
* 部门信息
|
|
* 部门信息
|
|
- *
|
|
|
|
|
|
+ *
|
|
* @author ruoyi
|
|
* @author ruoyi
|
|
*/
|
|
*/
|
|
@RestController
|
|
@RestController
|
|
@RequestMapping("/system/dept")
|
|
@RequestMapping("/system/dept")
|
|
-public class SysDeptController extends BaseController
|
|
|
|
-{
|
|
|
|
|
|
+public class SysDeptController extends BaseController {
|
|
@Autowired
|
|
@Autowired
|
|
private ISysDeptService deptService;
|
|
private ISysDeptService deptService;
|
|
|
|
|
|
@@ -39,8 +32,7 @@ public class SysDeptController extends BaseController
|
|
*/
|
|
*/
|
|
@PreAuthorize("@ss.hasPermi('system:dept:list')")
|
|
@PreAuthorize("@ss.hasPermi('system:dept:list')")
|
|
@GetMapping("/list")
|
|
@GetMapping("/list")
|
|
- public AjaxResult list(SysDept dept)
|
|
|
|
- {
|
|
|
|
|
|
+ public AjaxResult list(SysDept dept) {
|
|
List<SysDept> depts = deptService.selectDeptList(dept);
|
|
List<SysDept> depts = deptService.selectDeptList(dept);
|
|
return success(depts);
|
|
return success(depts);
|
|
}
|
|
}
|
|
@@ -50,8 +42,7 @@ public class SysDeptController extends BaseController
|
|
*/
|
|
*/
|
|
@PreAuthorize("@ss.hasPermi('system:dept:list')")
|
|
@PreAuthorize("@ss.hasPermi('system:dept:list')")
|
|
@GetMapping("/list/exclude/{deptId}")
|
|
@GetMapping("/list/exclude/{deptId}")
|
|
- public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId)
|
|
|
|
- {
|
|
|
|
|
|
+ public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId) {
|
|
List<SysDept> depts = deptService.selectDeptList(new SysDept());
|
|
List<SysDept> depts = deptService.selectDeptList(new SysDept());
|
|
depts.removeIf(d -> d.getDeptId().intValue() == deptId || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + ""));
|
|
depts.removeIf(d -> d.getDeptId().intValue() == deptId || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + ""));
|
|
return success(depts);
|
|
return success(depts);
|
|
@@ -62,8 +53,7 @@ public class SysDeptController extends BaseController
|
|
*/
|
|
*/
|
|
@PreAuthorize("@ss.hasPermi('system:dept:query')")
|
|
@PreAuthorize("@ss.hasPermi('system:dept:query')")
|
|
@GetMapping(value = "/{deptId}")
|
|
@GetMapping(value = "/{deptId}")
|
|
- public AjaxResult getInfo(@PathVariable Long deptId)
|
|
|
|
- {
|
|
|
|
|
|
+ public AjaxResult getInfo(@PathVariable Long deptId) {
|
|
deptService.checkDeptDataScope(deptId);
|
|
deptService.checkDeptDataScope(deptId);
|
|
return success(deptService.selectDeptById(deptId));
|
|
return success(deptService.selectDeptById(deptId));
|
|
}
|
|
}
|
|
@@ -74,10 +64,8 @@ public class SysDeptController extends BaseController
|
|
@PreAuthorize("@ss.hasPermi('system:dept:add')")
|
|
@PreAuthorize("@ss.hasPermi('system:dept:add')")
|
|
@Log(title = "部门管理", businessType = BusinessType.INSERT)
|
|
@Log(title = "部门管理", businessType = BusinessType.INSERT)
|
|
@PostMapping
|
|
@PostMapping
|
|
- public AjaxResult add(@Validated @RequestBody SysDept dept)
|
|
|
|
- {
|
|
|
|
- if (!deptService.checkDeptNameUnique(dept))
|
|
|
|
- {
|
|
|
|
|
|
+ public AjaxResult add(@Validated @RequestBody SysDept dept) {
|
|
|
|
+ if (!deptService.checkDeptNameUnique(dept)) {
|
|
return error("新增部门'" + dept.getDeptName() + "'失败,部门名称已存在");
|
|
return error("新增部门'" + dept.getDeptName() + "'失败,部门名称已存在");
|
|
}
|
|
}
|
|
dept.setCreateBy(getUsername());
|
|
dept.setCreateBy(getUsername());
|
|
@@ -90,20 +78,14 @@ public class SysDeptController extends BaseController
|
|
@PreAuthorize("@ss.hasPermi('system:dept:edit')")
|
|
@PreAuthorize("@ss.hasPermi('system:dept:edit')")
|
|
@Log(title = "部门管理", businessType = BusinessType.UPDATE)
|
|
@Log(title = "部门管理", businessType = BusinessType.UPDATE)
|
|
@PostMapping("/put")
|
|
@PostMapping("/put")
|
|
- public AjaxResult edit(@Validated @RequestBody SysDept dept)
|
|
|
|
- {
|
|
|
|
|
|
+ public AjaxResult edit(@Validated @RequestBody SysDept dept) {
|
|
Long deptId = dept.getDeptId();
|
|
Long deptId = dept.getDeptId();
|
|
deptService.checkDeptDataScope(deptId);
|
|
deptService.checkDeptDataScope(deptId);
|
|
- if (!deptService.checkDeptNameUnique(dept))
|
|
|
|
- {
|
|
|
|
|
|
+ if (!deptService.checkDeptNameUnique(dept)) {
|
|
return error("修改部门'" + dept.getDeptName() + "'失败,部门名称已存在");
|
|
return error("修改部门'" + dept.getDeptName() + "'失败,部门名称已存在");
|
|
- }
|
|
|
|
- else if (dept.getParentId().equals(deptId))
|
|
|
|
- {
|
|
|
|
|
|
+ } else if (dept.getParentId().equals(deptId)) {
|
|
return error("修改部门'" + dept.getDeptName() + "'失败,上级部门不能是自己");
|
|
return error("修改部门'" + dept.getDeptName() + "'失败,上级部门不能是自己");
|
|
- }
|
|
|
|
- else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus()) && deptService.selectNormalChildrenDeptById(deptId) > 0)
|
|
|
|
- {
|
|
|
|
|
|
+ } else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus()) && deptService.selectNormalChildrenDeptById(deptId) > 0) {
|
|
return error("该部门包含未停用的子部门!");
|
|
return error("该部门包含未停用的子部门!");
|
|
}
|
|
}
|
|
dept.setUpdateBy(getUsername());
|
|
dept.setUpdateBy(getUsername());
|
|
@@ -116,14 +98,11 @@ public class SysDeptController extends BaseController
|
|
@PreAuthorize("@ss.hasPermi('system:dept:remove')")
|
|
@PreAuthorize("@ss.hasPermi('system:dept:remove')")
|
|
@Log(title = "部门管理", businessType = BusinessType.DELETE)
|
|
@Log(title = "部门管理", businessType = BusinessType.DELETE)
|
|
@GetMapping("/delete/{deptId}")
|
|
@GetMapping("/delete/{deptId}")
|
|
- public AjaxResult remove(@PathVariable Long deptId)
|
|
|
|
- {
|
|
|
|
- if (deptService.hasChildByDeptId(deptId))
|
|
|
|
- {
|
|
|
|
|
|
+ public AjaxResult remove(@PathVariable Long deptId) {
|
|
|
|
+ if (deptService.hasChildByDeptId(deptId)) {
|
|
return warn("存在下级部门,不允许删除");
|
|
return warn("存在下级部门,不允许删除");
|
|
}
|
|
}
|
|
- if (deptService.checkDeptExistUser(deptId))
|
|
|
|
- {
|
|
|
|
|
|
+ if (deptService.checkDeptExistUser(deptId)) {
|
|
return warn("部门存在用户,不允许删除");
|
|
return warn("部门存在用户,不允许删除");
|
|
}
|
|
}
|
|
deptService.checkDeptDataScope(deptId);
|
|
deptService.checkDeptDataScope(deptId);
|