From ebb9f15a75562963afd2bce8c089006d686fe7f8 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期日, 30 十月 2022 12:02:06 +0800
Subject: [PATCH] 新增返回警告消息提示
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
index 6dd1756..a873066 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
@@ -42,7 +42,7 @@
public AjaxResult list(SysDept dept)
{
List<SysDept> depts = deptService.selectDeptList(dept);
- return AjaxResult.success(depts);
+ return success(depts);
}
/**
@@ -54,7 +54,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);
}
/**
@@ -65,7 +65,7 @@
public AjaxResult getInfo(@PathVariable Long deptId)
{
deptService.checkDeptDataScope(deptId);
- return AjaxResult.success(deptService.selectDeptById(deptId));
+ return success(deptService.selectDeptById(deptId));
}
/**
@@ -78,7 +78,7 @@
{
if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
{
- return AjaxResult.error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
+ return error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
}
dept.setCreateBy(getUsername());
return toAjax(deptService.insertDept(dept));
@@ -96,15 +96,15 @@
deptService.checkDeptDataScope(deptId);
if (UserConstants.NOT_UNIQUE.equals(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(getUsername());
return toAjax(deptService.updateDept(dept));
@@ -120,11 +120,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.2