|
@@ -81,9 +81,9 @@ public class CompanyServiceImpl extends ServiceImpl<ICompanyMapper, Company> imp
|
|
|
userEntity.setUserName(param.getManagerPhone());
|
|
|
userEntity.setCompanyId(entity.getId());
|
|
|
userEntity.setNickName(param.getManagerName());
|
|
|
- userEntity.setCreateTime(DateUtil.date2String(new Date(),"yyyy-MM-dd HH:mm:ss"));
|
|
|
+ userEntity.setCreateTime(new Date());
|
|
|
userEntity.setUpdateTime(new Date());
|
|
|
- userEntity.setRegisterTime(DateUtil.date2String(new Date(),"yyyy-MM-dd HH:mm:ss"));
|
|
|
+ userEntity.setRegisterTime(new Date());
|
|
|
userEntity.setRecStatus("A");
|
|
|
userService.save(userEntity);
|
|
|
|
|
@@ -296,13 +296,13 @@ public class CompanyServiceImpl extends ServiceImpl<ICompanyMapper, Company> imp
|
|
|
}
|
|
|
}else{
|
|
|
userEntity = new User();
|
|
|
- userEntity.setRegisterTime(DateUtil.date2String(new Date(),"yyyy-MM-dd HH:mm:ss"));
|
|
|
+ userEntity.setRegisterTime(new Date());
|
|
|
}
|
|
|
userEntity.setPassword(SecurityUtil.MD5("Geosign123"));
|
|
|
userEntity.setUserName(user.getUserName());
|
|
|
userEntity.setCompanyId(tbCompany.getId());
|
|
|
userEntity.setNickName(user.getNickName());
|
|
|
- userEntity.setCreateTime(DateUtil.date2String(currentDate,"yyyy-MM-dd HH:mm:ss"));
|
|
|
+ userEntity.setCreateTime(new Date());
|
|
|
userEntity.setUpdateTime(currentDate);
|
|
|
userEntity.setRecStatus("A");
|
|
|
if (ObjectUtils.isEmpty(userEntity.getId())) {
|