From ab77b8cb8d059dc2b06c91f753f93a99f231ccb7 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Tue, 24 Mar 2026 10:52:30 +0800
Subject: [PATCH] 优化菜单主题风格
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java | 95 ++++++++++++++++++++---------------------------
1 files changed, 40 insertions(+), 55 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java
index c6111bb..97cb935 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java
@@ -1,7 +1,7 @@
package com.ruoyi.system.controller;
-import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@@ -19,7 +19,7 @@
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.security.annotation.PreAuthorize;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.domain.SysDept;
import com.ruoyi.system.service.ISysDeptService;
@@ -39,79 +39,48 @@
/**
* 获取部门列表
*/
- @PreAuthorize(hasPermi = "system:dept:list")
+ @RequiresPermissions("system:dept:list")
@GetMapping("/list")
public AjaxResult list(SysDept dept)
{
List<SysDept> depts = deptService.selectDeptList(dept);
- return AjaxResult.success(depts);
+ return success(depts);
}
/**
* 查询部门列表（排除节点）
*/
- @PreAuthorize(hasPermi = "system:dept:list")
+ @RequiresPermissions("system:dept:list")
@GetMapping("/list/exclude/{deptId}")
public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId)
{
List<SysDept> depts = deptService.selectDeptList(new SysDept());
- Iterator<SysDept> it = depts.iterator();
- while (it.hasNext())
- {
- SysDept d = (SysDept) it.next();
- if (d.getDeptId().intValue() == deptId
- || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + ""))
- {
- it.remove();
- }
- }
- return AjaxResult.success(depts);
+ depts.removeIf(d -> d.getDeptId().intValue() == deptId || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + ""));
+ return success(depts);
}
/**
* 根据部门编号获取详细信息
*/
- @PreAuthorize(hasPermi = "system:dept:query")
+ @RequiresPermissions("system:dept:query")
@GetMapping(value = "/{deptId}")
public AjaxResult getInfo(@PathVariable Long deptId)
{
- return AjaxResult.success(deptService.selectDeptById(deptId));
- }
-
- /**
- * 获取部门下拉树列表
- */
- @GetMapping("/treeselect")
- public AjaxResult treeselect(SysDept dept)
- {
- List<SysDept> depts = deptService.selectDeptList(dept);
- return AjaxResult.success(deptService.buildDeptTreeSelect(depts));
- }
-
- /**
- * 加载对应角色部门列表树
- */
- @GetMapping(value = "/roleDeptTreeselect/{roleId}")
- public AjaxResult roleDeptTreeselect(@PathVariable("roleId") Long roleId)
- {
- List<SysDept> depts = deptService.selectDeptList(new SysDept());
- AjaxResult ajax = AjaxResult.success();
- ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId));
- ajax.put("depts", deptService.buildDeptTreeSelect(depts));
- return ajax;
+ deptService.checkDeptDataScope(deptId);
+ return success(deptService.selectDeptById(deptId));
}
/**
* 新增部门
*/
- @PreAuthorize(hasPermi = "system:dept:add")
+ @RequiresPermissions("system:dept:add")
@Log(title = "部门管理", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@Validated @RequestBody SysDept dept)
{
- if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
+ if (!deptService.checkDeptNameUnique(dept))
{
- return AjaxResult.error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
+ return error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
}
dept.setCreateBy(SecurityUtils.getUsername());
return toAjax(deptService.insertDept(dept));
@@ -120,44 +89,60 @@
/**
* 修改部门
*/
- @PreAuthorize(hasPermi = "system:dept:edit")
+ @RequiresPermissions("system:dept:edit")
@Log(title = "部门管理", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@Validated @RequestBody SysDept dept)
{
- if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
+ Long deptId = dept.getDeptId();
+ deptService.checkDeptDataScope(deptId);
+ if (!deptService.checkDeptNameUnique(dept))
{
- return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
+ return error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
}
- else if (dept.getParentId().equals(dept.getDeptId()))
+ else if (dept.getParentId().equals(deptId))
{
- return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己");
+ return error("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己");
}
- else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus())
- && deptService.selectNormalChildrenDeptById(dept.getDeptId()) > 0)
+ else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus()) && deptService.selectNormalChildrenDeptById(deptId) > 0)
{
- return AjaxResult.error("该部门包含未停用的子部门！");
+ return error("该部门包含未停用的子部门！");
}
dept.setUpdateBy(SecurityUtils.getUsername());
return toAjax(deptService.updateDept(dept));
}
/**
+ * 保存部门排序
+ */
+ @RequiresPermissions("system:dept:edit")
+ @Log(title = "保存部门排序", businessType = BusinessType.UPDATE)
+ @PutMapping("/updateSort")
+ public AjaxResult updateSort(@RequestBody Map<String, String> params)
+ {
+ String[] deptIds = params.get("deptIds").split(",");
+ String[] orderNums = params.get("orderNums").split(",");
+ deptService.updateDeptSort(deptIds, orderNums);
+ return success();
+ }
+
+ /**
* 删除部门
*/
- @PreAuthorize(hasPermi = "system:dept:remove")
+ @RequiresPermissions("system:dept:remove")
@Log(title = "部门管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{deptId}")
public AjaxResult remove(@PathVariable Long deptId)
{
if (deptService.hasChildByDeptId(deptId))
{
- return AjaxResult.error("存在下级部门,不允许删除");
+ return warn("存在下级部门,不允许删除");
}
if (deptService.checkDeptExistUser(deptId))
{
- return AjaxResult.error("部门存在用户,不允许删除");
+ return warn("部门存在用户,不允许删除");
}
+ deptService.checkDeptDataScope(deptId);
return toAjax(deptService.deleteDeptById(deptId));
}
}
--
Gitblit v1.9.3