mirror of
https://github.com/zccbbg/wms-ruoyi.git
synced 2024-09-20 11:05:54 +08:00
update: 删除状态常量优化
This commit is contained in:
parent
110f097d4d
commit
4ef3c3a678
|
@ -10,7 +10,7 @@ public interface UserConstants {
|
|||
/**
|
||||
* 未被删除用户
|
||||
*/
|
||||
String USER_NOT_DELETED = "0";
|
||||
String NOT_DELETED = "0";
|
||||
|
||||
/**
|
||||
* 角色正常状态
|
||||
|
|
|
@ -71,7 +71,7 @@ public class SysUserService implements UserService {
|
|||
private Wrapper<SysUser> buildQueryWrapper(SysUserBo user) {
|
||||
Map<String, Object> params = user.getParams();
|
||||
QueryWrapper<SysUser> wrapper = Wrappers.query();
|
||||
wrapper.eq("u.del_flag", UserConstants.USER_NOT_DELETED)
|
||||
wrapper.eq("u.del_flag", UserConstants.NOT_DELETED)
|
||||
.eq(ObjectUtil.isNotNull(user.getUserId()), "u.user_id", user.getUserId())
|
||||
.like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName())
|
||||
.eq(StringUtils.isNotBlank(user.getStatus()), "u.status", user.getStatus())
|
||||
|
@ -97,7 +97,7 @@ public class SysUserService implements UserService {
|
|||
*/
|
||||
public TableDataInfo<SysUserVo> selectAllocatedList(SysUserBo user, PageQuery pageQuery) {
|
||||
QueryWrapper<SysUser> wrapper = Wrappers.query();
|
||||
wrapper.eq("u.del_flag", UserConstants.USER_NOT_DELETED)
|
||||
wrapper.eq("u.del_flag", UserConstants.NOT_DELETED)
|
||||
.eq(ObjectUtil.isNotNull(user.getRoleId()), "r.role_id", user.getRoleId())
|
||||
.like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName())
|
||||
.eq(StringUtils.isNotBlank(user.getStatus()), "u.status", user.getStatus())
|
||||
|
@ -115,7 +115,7 @@ public class SysUserService implements UserService {
|
|||
public TableDataInfo<SysUserVo> selectUnallocatedList(SysUserBo user, PageQuery pageQuery) {
|
||||
List<Long> userIds = userRoleMapper.selectUserIdsByRoleId(user.getRoleId());
|
||||
QueryWrapper<SysUser> wrapper = Wrappers.query();
|
||||
wrapper.eq("u.del_flag", UserConstants.USER_NOT_DELETED)
|
||||
wrapper.eq("u.del_flag", UserConstants.NOT_DELETED)
|
||||
.and(w -> w.ne("r.role_id", user.getRoleId()).or().isNull("r.role_id"))
|
||||
.notIn(CollUtil.isNotEmpty(userIds), "u.user_id", userIds)
|
||||
.like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName())
|
||||
|
|
|
@ -66,7 +66,7 @@ public class SysRoleServiceImpl implements ISysRoleService {
|
|||
private Wrapper<SysRole> buildQueryWrapper(SysRole role) {
|
||||
Map<String, Object> params = role.getParams();
|
||||
QueryWrapper<SysRole> wrapper = Wrappers.query();
|
||||
wrapper.eq("r.del_flag", UserConstants.ROLE_NORMAL)
|
||||
wrapper.eq("r.del_flag", UserConstants.NOT_DELETED)
|
||||
.eq(ObjectUtil.isNotNull(role.getRoleId()), "r.role_id", role.getRoleId())
|
||||
.like(StringUtils.isNotBlank(role.getRoleName()), "r.role_name", role.getRoleName())
|
||||
.eq(StringUtils.isNotBlank(role.getStatus()), "r.status", role.getStatus())
|
||||
|
|
Loading…
Reference in a new issue