From 1002b36c0a698c794320d1544c464c13b303e53c Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Thu, 16 Apr 2026 13:44:02 +0800
Subject: [PATCH] 优化白名单支持对通配符路径匹配
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java | 37 ++++++++++++++++++++++++++-----------
1 files changed, 26 insertions(+), 11 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 eb100fa..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,6 +1,7 @@
package com.ruoyi.system.controller;
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;
@@ -43,7 +44,7 @@
public AjaxResult list(SysDept dept)
{
List<SysDept> depts = deptService.selectDeptList(dept);
- return AjaxResult.success(depts);
+ return success(depts);
}
/**
@@ -55,7 +56,7 @@
{
List<SysDept> depts = deptService.selectDeptList(new SysDept());
depts.removeIf(d -> d.getDeptId().intValue() == deptId || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + ""));
- return AjaxResult.success(depts);
+ return success(depts);
}
/**
@@ -66,7 +67,7 @@
public AjaxResult getInfo(@PathVariable Long deptId)
{
deptService.checkDeptDataScope(deptId);
- return AjaxResult.success(deptService.selectDeptById(deptId));
+ return success(deptService.selectDeptById(deptId));
}
/**
@@ -77,9 +78,9 @@
@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));
@@ -95,20 +96,34 @@
{
Long deptId = dept.getDeptId();
deptService.checkDeptDataScope(deptId);
- if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
+ if (!deptService.checkDeptNameUnique(dept))
{
- return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
+ return error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
}
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(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();
}
/**
@@ -121,11 +136,11 @@
{
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