From 0ce3c1d78e805075385e94729d89d8dbe0b52fb7 Mon Sep 17 00:00:00 2001
From: huangdeliang <huangdeliang@skieer.com>
Date: Fri, 9 Oct 2020 21:27:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E7=A6=81=E7=94=A8=E7=9A=84?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/system/SysUserController.java | 16 ++++++++--------
 .../mapper/custom/CusUserPostMapper.xml          |  2 +-
 2 files changed, 9 insertions(+), 9 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 946df4d60..a35e3c334 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
@@ -127,14 +127,14 @@ public class SysUserController extends BaseController
         {
             return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
         }
-        else if (UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
-        {
-            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
-        }
-        else if (UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
-        {
-            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
-        }
+//        else if (UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
+//        {
+//            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
+//        }
+//        else if (UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
+//        {
+//            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+//        }
         user.setCreateBy(SecurityUtils.getUsername());
         user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
         return toAjax(userService.insertUser(user));
diff --git a/ruoyi-custom/src/main/resources/mapper/custom/CusUserPostMapper.xml b/ruoyi-custom/src/main/resources/mapper/custom/CusUserPostMapper.xml
index 112b4036d..01a18163e 100644
--- a/ruoyi-custom/src/main/resources/mapper/custom/CusUserPostMapper.xml
+++ b/ruoyi-custom/src/main/resources/mapper/custom/CusUserPostMapper.xml
@@ -16,7 +16,7 @@
     <sql id="selectCusUserPostVo">
         SELECT u.user_id, u.nick_name, p.post_id, p.post_code, p.post_name, u.remark
         FROM sys_user u, sys_post p, sys_user_post up
-        WHERE up.user_id = u.user_id AND p.post_id = up.post_id AND p.post_id > 4
+        WHERE up.user_id = u.user_id AND p.post_id = up.post_id AND p.post_id > 4 AND u.status = 0
     </sql>
 
     <select id="selectAllCusUserPost" parameterType="CusUserPost" resultMap="CusUserPostResult">