From 3c5dfdcf574f5f827b9764fca4062d5ffeb4d7f9 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期三, 16 十一月 2022 09:41:47 +0800 Subject: [PATCH] !248 优化GlobalExceptionHandler.handleServiceException多余的类型转换,脚本乱码。 Merge pull request !248 from scmiot/dev --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java | 4 ++-- 1 files changed, 2 insertions(+), 2 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 411eee9..fa763df 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 @@ -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)); -- Gitblit v1.9.3