|
@@ -44,11 +44,14 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
|
|
if (!loginName.equals(userEntity.getLoginName())) {
|
|
if (!loginName.equals(userEntity.getLoginName())) {
|
|
throw new StatusException("用户名不能修改");
|
|
throw new StatusException("用户名不能修改");
|
|
}
|
|
}
|
|
|
|
+ user = userEntity;
|
|
|
|
+ user.setUpdateTime(new Date());
|
|
} else {
|
|
} else {
|
|
// 新增时用户名不能重复
|
|
// 新增时用户名不能重复
|
|
if (this.count(new QueryWrapper<UserEntity>().lambda().eq(UserEntity::getLoginName,loginName)) > 0){
|
|
if (this.count(new QueryWrapper<UserEntity>().lambda().eq(UserEntity::getLoginName,loginName)) > 0){
|
|
throw new StatusException("该账号已存在");
|
|
throw new StatusException("该账号已存在");
|
|
}
|
|
}
|
|
|
|
+ user.setCreateTime(new Date());
|
|
}
|
|
}
|
|
|
|
|
|
RoleMeta requestUserRole = requestUser.getRole();
|
|
RoleMeta requestUserRole = requestUser.getRole();
|
|
@@ -75,9 +78,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
|
|
user.setName(name);
|
|
user.setName(name);
|
|
}
|
|
}
|
|
user.setCreatorId(requestUserId);
|
|
user.setCreatorId(requestUserId);
|
|
- user.setCreateTime(new Date());
|
|
|
|
user.setUpdaterId(requestUserId);
|
|
user.setUpdaterId(requestUserId);
|
|
- user.setUpdateTime(new Date());
|
|
|
|
if (password != null && password.length() > 0) {
|
|
if (password != null && password.length() > 0) {
|
|
user.setPassword(password);
|
|
user.setPassword(password);
|
|
}
|
|
}
|