|
|
|
@ -115,11 +115,11 @@ public class SysUserServiceImpl implements ISysUserService {
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
public TableDataInfo<SysUser> selectUnallocatedList(SysUser user, PageQuery pageQuery) {
|
|
|
|
|
Long userId = userRoleMapper.selectUserIdByRoleId(user.getRoleId());
|
|
|
|
|
List<Long> userIds = userRoleMapper.selectUserIdsByRoleId(user.getRoleId());
|
|
|
|
|
QueryWrapper<SysUser> wrapper = Wrappers.query();
|
|
|
|
|
wrapper.eq("u.del_flag", UserConstants.USER_NORMAL)
|
|
|
|
|
.and(w -> w.ne("r.role_id", user.getRoleId()).or().isNull("r.role_id"))
|
|
|
|
|
.notIn("u.user_id", userId)
|
|
|
|
|
.notIn("u.user_id", userIds)
|
|
|
|
|
.like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName())
|
|
|
|
|
.like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phonenumber", user.getPhonenumber());
|
|
|
|
|
Page<SysUser> page = baseMapper.selectUnallocatedList(pageQuery.build(), wrapper);
|
|
|
|
|