|
@@ -87,9 +87,11 @@ public class CompanyContactServiceImpl implements CompanyContactService {
|
|
|
lastCompanyContactInfoMapper.insert(lastCompanyContactInfoDO);
|
|
|
}else{
|
|
|
String contactDate = companyContactInfoVO.getContactDate();
|
|
|
- if(Objects.requireNonNull(DateUtils.parse(contactDate, DateUtils.YYYY_MM_DD)).compareTo(lastCompanyContactInfoDO.getContactDate()) >= 0){
|
|
|
- companyContactInfoDO.toLastDO(lastCompanyContactInfoDO);
|
|
|
- lastCompanyContactInfoMapper.updateById(lastCompanyContactInfoDO);
|
|
|
+ if(lastCompanyContactInfoDO.getContactDate() != null){
|
|
|
+ if(Objects.requireNonNull(DateUtils.parse(contactDate, DateUtils.YYYY_MM_DD)).compareTo(lastCompanyContactInfoDO.getContactDate()) >= 0){
|
|
|
+ companyContactInfoDO.toLastDO(lastCompanyContactInfoDO);
|
|
|
+ lastCompanyContactInfoMapper.updateById(lastCompanyContactInfoDO);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
vo.setData(true);
|