Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

过滤禁用的用户

Browse Source
This commit is contained in:
huangdeliang 2020-10-09 21:27:50 +08:00
parent 9883e9c80f
commit 0ce3c1d78e
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
View File

@ -127,14 +127,14 @@ public class SysUserController extends BaseController
{ {
return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，登录账号已存在"); return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
} }
else if (UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) // else if (UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
{ // {
return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，手机号码已存在"); // return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
} // }
else if (UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) // else if (UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
{ // {
return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在"); // return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
} // }
user.setCreateBy(SecurityUtils.getUsername()); user.setCreateBy(SecurityUtils.getUsername());
user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
return toAjax(userService.insertUser(user)); return toAjax(userService.insertUser(user));

2
ruoyi-custom/src/main/resources/mapper/custom/CusUserPostMapper.xml
View File

@ -16,7 +16,7 @@
<sql id="selectCusUserPostVo"> <sql id="selectCusUserPostVo">
SELECT u.user_id, u.nick_name, p.post_id, p.post_code, p.post_name, u.remark 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 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> </sql>
<select id="selectAllCusUserPost" parameterType="CusUserPost" resultMap="CusUserPostResult"> <select id="selectAllCusUserPost" parameterType="CusUserPost" resultMap="CusUserPostResult">