|
@@ -84,7 +84,7 @@ public class SysUserServiceImpl implements ISysUserService {
|
84
|
84
|
.eq(ObjectUtil.isNotNull(user.getUserId()), "u.user_id", user.getUserId())
|
85
|
85
|
.like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName())
|
86
|
86
|
.eq(StringUtils.isNotBlank(user.getStatus()), "u.status", user.getStatus())
|
87
|
|
- .like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phone", user.getPhonenumber())
|
|
87
|
+ .like(StringUtils.isNotBlank(user.getPhone()), "u.phone", user.getPhone())
|
88
|
88
|
.between(params.get("beginTime") != null && params.get("endTime") != null,
|
89
|
89
|
"u.create_time", params.get("beginTime"), params.get("endTime"))
|
90
|
90
|
.and(ObjectUtil.isNotNull(user.getDeptId()), w -> {
|
|
@@ -114,7 +114,7 @@ public class SysUserServiceImpl implements ISysUserService {
|
114
|
114
|
.eq(ObjectUtil.isNotNull(user.getRoleId()), "r.role_id", user.getRoleId())
|
115
|
115
|
.like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName())
|
116
|
116
|
.eq(StringUtils.isNotBlank(user.getStatus()), "u.status", user.getStatus())
|
117
|
|
- .like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phone", user.getPhonenumber())
|
|
117
|
+ .like(StringUtils.isNotBlank(user.getPhone()), "u.phone", user.getPhone())
|
118
|
118
|
.orderByAsc("u.user_id");
|
119
|
119
|
Page<SysUserVo> page = baseMapper.selectAllocatedList(pageQuery.build(), wrapper);
|
120
|
120
|
return TableDataInfo.build(page);
|
|
@@ -134,7 +134,7 @@ public class SysUserServiceImpl implements ISysUserService {
|
134
|
134
|
.and(w -> w.ne("r.role_id", user.getRoleId()).or().isNull("r.role_id"))
|
135
|
135
|
.notIn(CollUtil.isNotEmpty(userIds), "u.user_id", userIds)
|
136
|
136
|
.like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName())
|
137
|
|
- .like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phone", user.getPhonenumber())
|
|
137
|
+ .like(StringUtils.isNotBlank(user.getPhone()), "u.phone", user.getPhone())
|
138
|
138
|
.orderByAsc("u.user_id");
|
139
|
139
|
Page<SysUserVo> page = baseMapper.selectUnallocatedList(pageQuery.build(), wrapper);
|
140
|
140
|
return TableDataInfo.build(page);
|
|
@@ -246,7 +246,7 @@ public class SysUserServiceImpl implements ISysUserService {
|
246
|
246
|
@Override
|
247
|
247
|
public boolean checkPhoneUnique(SysUserBo user) {
|
248
|
248
|
boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysUser>()
|
249
|
|
- .eq(SysUser::getPhone, user.getPhonenumber())
|
|
249
|
+ .eq(SysUser::getPhone, user.getPhone())
|
250
|
250
|
.ne(ObjectUtil.isNotNull(user.getUserId()), SysUser::getUserId, user.getUserId()));
|
251
|
251
|
return !exist;
|
252
|
252
|
}
|
|
@@ -391,7 +391,7 @@ public class SysUserServiceImpl implements ISysUserService {
|
391
|
391
|
return baseMapper.update(null,
|
392
|
392
|
new LambdaUpdateWrapper<SysUser>()
|
393
|
393
|
.set(ObjectUtil.isNotNull(user.getNickName()), SysUser::getNickName, user.getNickName())
|
394
|
|
- .set(SysUser::getPhone, user.getPhonenumber())
|
|
394
|
+ .set(SysUser::getPhone, user.getPhone())
|
395
|
395
|
.set(SysUser::getEmail, user.getEmail())
|
396
|
396
|
.set(SysUser::getSex, user.getSex())
|
397
|
397
|
.eq(SysUser::getUserId, user.getUserId()));
|