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 @@
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