houzhongfei
2022-12-14 53ae4ea6bc1a1bb4e20b7591e7b4d42da8fcb05e
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
@@ -108,10 +108,10 @@
    @DeleteMapping("/{deptId}")
    public R<Void> remove(@PathVariable Long deptId) {
        if (deptService.hasChildByDeptId(deptId)) {
            return R.fail("存在下级部门,不允许删除");
            return R.warn("存在下级部门,不允许删除");
        }
        if (deptService.checkDeptExistUser(deptId)) {
            return R.fail("部门存在用户,不允许删除");
            return R.warn("部门存在用户,不允许删除");
        }
        deptService.checkDeptDataScope(deptId);
        return toAjax(deptService.deleteDeptById(deptId));