|
@@ -542,6 +542,7 @@ public class UserController {
|
|
|
LambdaQueryWrapper<User> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<User> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
lambdaQueryWrapper.like(StringUtils.isNotBlank(userVO.getRealName()), User::getRealName, userVO.getRealName())
|
|
lambdaQueryWrapper.like(StringUtils.isNotBlank(userVO.getRealName()), User::getRealName, userVO.getRealName())
|
|
|
.like(ObjectUtil.isNotEmpty(userVO.getDeptPid()), User::getDeptPid, userVO.getDeptPid())
|
|
.like(ObjectUtil.isNotEmpty(userVO.getDeptPid()), User::getDeptPid, userVO.getDeptPid())
|
|
|
|
|
+ .like(ObjectUtil.isNotEmpty(userVO.getRealName()), User::getRealName, userVO.getRealName())
|
|
|
.eq(User::getTenantId, AuthUtil.getTenantId())
|
|
.eq(User::getTenantId, AuthUtil.getTenantId())
|
|
|
.eq(User::getIsDeleted, 0);
|
|
.eq(User::getIsDeleted, 0);
|
|
|
if (StringUtil.isNotBlank(userVO.getRoleAlias())) {
|
|
if (StringUtil.isNotBlank(userVO.getRoleAlias())) {
|