|
@@ -81,9 +81,6 @@ public class CompanyServiceImpl extends ServiceImpl<ICompanyMapper, Company> imp
|
|
userEntity.setUserName(param.getManagerPhone());
|
|
userEntity.setUserName(param.getManagerPhone());
|
|
userEntity.setCompanyId(entity.getId());
|
|
userEntity.setCompanyId(entity.getId());
|
|
userEntity.setNickName(param.getManagerName());
|
|
userEntity.setNickName(param.getManagerName());
|
|
- userEntity.setCreateTime(new Date());
|
|
|
|
- userEntity.setUpdateTime(new Date());
|
|
|
|
- userEntity.setRegisterTime(new Date());
|
|
|
|
userEntity.setRecStatus("A");
|
|
userEntity.setRecStatus("A");
|
|
userService.save(userEntity);
|
|
userService.save(userEntity);
|
|
|
|
|
|
@@ -271,7 +268,6 @@ public class CompanyServiceImpl extends ServiceImpl<ICompanyMapper, Company> imp
|
|
.filter(param -> !org.apache.commons.lang3.StringUtils.equals(param.getNickName(), user.getNickName()))
|
|
.filter(param -> !org.apache.commons.lang3.StringUtils.equals(param.getNickName(), user.getNickName()))
|
|
.forEach(upUser -> {
|
|
.forEach(upUser -> {
|
|
user.setNickName(upUser.getNickName());
|
|
user.setNickName(upUser.getNickName());
|
|
- user.setUpdateTime(currentDate);
|
|
|
|
userService.updateById(user);
|
|
userService.updateById(user);
|
|
}
|
|
}
|
|
);
|
|
);
|
|
@@ -296,14 +292,11 @@ public class CompanyServiceImpl extends ServiceImpl<ICompanyMapper, Company> imp
|
|
}
|
|
}
|
|
}else{
|
|
}else{
|
|
userEntity = new User();
|
|
userEntity = new User();
|
|
- userEntity.setRegisterTime(new Date());
|
|
|
|
}
|
|
}
|
|
userEntity.setPassword(SecurityUtil.MD5("Geosign123"));
|
|
userEntity.setPassword(SecurityUtil.MD5("Geosign123"));
|
|
userEntity.setUserName(user.getUserName());
|
|
userEntity.setUserName(user.getUserName());
|
|
userEntity.setCompanyId(tbCompany.getId());
|
|
userEntity.setCompanyId(tbCompany.getId());
|
|
userEntity.setNickName(user.getNickName());
|
|
userEntity.setNickName(user.getNickName());
|
|
- userEntity.setCreateTime(new Date());
|
|
|
|
- userEntity.setUpdateTime(currentDate);
|
|
|
|
userEntity.setRecStatus("A");
|
|
userEntity.setRecStatus("A");
|
|
if (ObjectUtils.isEmpty(userEntity.getId())) {
|
|
if (ObjectUtils.isEmpty(userEntity.getId())) {
|
|
userService.save(userEntity);
|
|
userService.save(userEntity);
|