Commit 143dce63 authored by tianyiming's avatar tianyiming

fix: 添加空检查以避免设置空许可信息

parent 38a37ecf
......@@ -1455,12 +1455,14 @@ public class DataHandlerServiceImpl {
BeanUtil.copyProperties(lis, esLicense);
return esLicense;
}).collect(Collectors.toList());
esBaseEnterpriseInfo.setLicenses(licenses);
try {
esBaseEnterpriseInfo.setLicenseMinExpiryDate(RefreshCmService.getMinDateFromLicensesEp(licenses));
esBaseEnterpriseInfo.setUnitType(onlineJyjc ? enterpriseInfo.getUnitType() : RefreshCmService.updateJyjcUnitType(enterpriseInfo.getUnitType(), licenses));
} catch (Exception e) {
log.error("企业信息单位类型或者取资质最小日期失败:{}", enterpriseInfo, e);
if (!ObjectUtils.isEmpty(licenses)) {
esBaseEnterpriseInfo.setLicenses(licenses);
try {
esBaseEnterpriseInfo.setLicenseMinExpiryDate(RefreshCmService.getMinDateFromLicensesEp(licenses));
esBaseEnterpriseInfo.setUnitType(RefreshCmService.updateJyjcUnitType(enterpriseInfo.getUnitType(), licenses));
} catch (Exception e) {
log.error("企业信息单位类型或者取资质最小日期失败:{}", enterpriseInfo, e);
}
}
return esBaseEnterpriseInfo;
}).collect(Collectors.toList());
......
......@@ -22,6 +22,7 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import org.springframework.util.ObjectUtils;
import java.util.List;
import java.util.Optional;
......@@ -80,12 +81,14 @@ public class EnterpriseRefreshHandler implements IDataRefreshHandler {
BeanUtil.copyProperties(lis, esLicense);
return esLicense;
}).collect(Collectors.toList());
esBaseEnterpriseInfo.setLicenses(licenses);
try {
esBaseEnterpriseInfo.setLicenseMinExpiryDate(RefreshCmService.getMinDateFromLicensesEp(licenses));
esBaseEnterpriseInfo.setUnitType(onlineJyjc ? enterpriseInfo.getUnitType() : RefreshCmService.updateJyjcUnitType(enterpriseInfo.getUnitType(), licenses));
} catch (Exception e) {
log.error("企业信息单位类型或者取资质最小日期失败:{}", enterpriseInfo, e);
if (!ObjectUtils.isEmpty(licenses)) {
esBaseEnterpriseInfo.setLicenses(licenses);
try {
esBaseEnterpriseInfo.setLicenseMinExpiryDate(RefreshCmService.getMinDateFromLicensesEp(licenses));
esBaseEnterpriseInfo.setUnitType(RefreshCmService.updateJyjcUnitType(enterpriseInfo.getUnitType(), licenses));
} catch (Exception e) {
log.error("企业信息单位类型或者取资质最小日期失败:{}", enterpriseInfo, e);
}
}
enterpriseInfoDao.save(esBaseEnterpriseInfo);
// 人员更新冗余的单位信息
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment