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/SysUserController.java |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index e4bcf78..f40f8b2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -85,7 +85,7 @@
         List<SysUser> userList = util.importExcel(file.getInputStream());
         String operName = getUsername();
         String message = userService.importUser(userList, updateSupport, operName);
-        return AjaxResult.success(message);
+        return success(message);
     }
 
     @PostMapping("/importTemplate")
@@ -127,17 +127,17 @@
     {
         if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user)))
         {
-            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败,登录账号已存在");
+            return error("新增用户'" + user.getUserName() + "'失败,登录账号已存在");
         }
         else if (StringUtils.isNotEmpty(user.getPhonenumber())
                 && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
         {
-            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败,手机号码已存在");
+            return error("新增用户'" + user.getUserName() + "'失败,手机号码已存在");
         }
         else if (StringUtils.isNotEmpty(user.getEmail())
                 && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
         {
-            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败,邮箱账号已存在");
+            return error("新增用户'" + user.getUserName() + "'失败,邮箱账号已存在");
         }
         user.setCreateBy(getUsername());
         user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
@@ -156,17 +156,17 @@
         userService.checkUserDataScope(user.getUserId());
         if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user)))
         {
-            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败,登录账号已存在");
+            return error("修改用户'" + user.getUserName() + "'失败,登录账号已存在");
         }
         else if (StringUtils.isNotEmpty(user.getPhonenumber())
                 && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
         {
-            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败,手机号码已存在");
+            return error("修改用户'" + user.getUserName() + "'失败,手机号码已存在");
         }
         else if (StringUtils.isNotEmpty(user.getEmail())
                 && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
         {
-            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败,邮箱账号已存在");
+            return error("修改用户'" + user.getUserName() + "'失败,邮箱账号已存在");
         }
         user.setUpdateBy(getUsername());
         return toAjax(userService.updateUser(user));
@@ -251,6 +251,6 @@
     @GetMapping("/deptTree")
     public AjaxResult deptTree(SysDept dept)
     {
-        return AjaxResult.success(deptService.selectDeptTreeList(dept));
+        return success(deptService.selectDeptTreeList(dept));
     }
 }

--
Gitblit v1.9.2