From d858c965cd19ae9c79a0b7ca25adfabe64c92936 Mon Sep 17 00:00:00 2001
From: huangdeliang <huangdeliang@skieer.com>
Date: Fri, 9 Oct 2020 21:47:05 +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 +-
 .../src/views/custom/commision/config/index.vue  |  6 +++---
 3 files changed, 12 insertions(+), 12 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 a35e3c334..ef50fdcea 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
@@ -149,14 +149,14 @@ public class SysUserController extends BaseController
     public AjaxResult edit(@Validated @RequestBody SysUser user)
     {
         userService.checkUserAllowed(user);
-        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() + "'失败，邮箱账号已存在");
-        }
+//        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.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(userService.updateUser(user));
     }
diff --git a/ruoyi-custom/src/main/resources/mapper/custom/CusUserPostMapper.xml b/ruoyi-custom/src/main/resources/mapper/custom/CusUserPostMapper.xml
index 01a18163e..c0fca4e1b 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 AND u.status = 0
+        WHERE up.user_id = u.user_id AND p.post_id = up.post_id AND p.remark = 'sale_post' AND u.status = 0
     </sql>
 
     <select id="selectAllCusUserPost" parameterType="CusUserPost" resultMap="CusUserPostResult">
diff --git a/ruoyi-ui/src/views/custom/commision/config/index.vue b/ruoyi-ui/src/views/custom/commision/config/index.vue
index 5a9b5ddd1..a9e6f181d 100644
--- a/ruoyi-ui/src/views/custom/commision/config/index.vue
+++ b/ruoyi-ui/src/views/custom/commision/config/index.vue
@@ -247,9 +247,9 @@
       this.getList();
       getOptions().then(response => {
         this.options = response.data.reduce((opts, cur) => {
-          if (cur.postCode.startsWith('planner')) {
-            return opts;
-          }
+          // if (cur.postCode.startsWith('planner')) {
+          //   return opts;
+          // }
           if (!opts[cur.postId]) {
             opts[cur.postId] = [];
           }