Commit 85589c46 authored by suhuiguang's avatar suhuiguang

fix(jg):bug修改

1.空指针异常处理
parent 143dce63
...@@ -1459,11 +1459,11 @@ public class DataHandlerServiceImpl { ...@@ -1459,11 +1459,11 @@ public class DataHandlerServiceImpl {
esBaseEnterpriseInfo.setLicenses(licenses); esBaseEnterpriseInfo.setLicenses(licenses);
try { try {
esBaseEnterpriseInfo.setLicenseMinExpiryDate(RefreshCmService.getMinDateFromLicensesEp(licenses)); esBaseEnterpriseInfo.setLicenseMinExpiryDate(RefreshCmService.getMinDateFromLicensesEp(licenses));
esBaseEnterpriseInfo.setUnitType(RefreshCmService.updateJyjcUnitType(enterpriseInfo.getUnitType(), licenses));
} catch (Exception e) { } catch (Exception e) {
log.error("企业信息单位类型或者取资质最小日期失败:{}", enterpriseInfo, e); log.error("企业信息单位类型或者取资质最小日期失败:{}", enterpriseInfo, e);
} }
} }
esBaseEnterpriseInfo.setUnitType(onlineJyjc ? enterpriseInfo.getUnitType() : RefreshCmService.updateJyjcUnitType(enterpriseInfo.getUnitType(), licenses));
return esBaseEnterpriseInfo; return esBaseEnterpriseInfo;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
enterpriseInfoDao.saveAll(esBaseEnterpriseInfos); enterpriseInfoDao.saveAll(esBaseEnterpriseInfos);
......
...@@ -85,11 +85,11 @@ public class EnterpriseRefreshHandler implements IDataRefreshHandler { ...@@ -85,11 +85,11 @@ public class EnterpriseRefreshHandler implements IDataRefreshHandler {
esBaseEnterpriseInfo.setLicenses(licenses); esBaseEnterpriseInfo.setLicenses(licenses);
try { try {
esBaseEnterpriseInfo.setLicenseMinExpiryDate(RefreshCmService.getMinDateFromLicensesEp(licenses)); esBaseEnterpriseInfo.setLicenseMinExpiryDate(RefreshCmService.getMinDateFromLicensesEp(licenses));
esBaseEnterpriseInfo.setUnitType(RefreshCmService.updateJyjcUnitType(enterpriseInfo.getUnitType(), licenses));
} catch (Exception e) { } catch (Exception e) {
log.error("企业信息单位类型或者取资质最小日期失败:{}", enterpriseInfo, e); log.error("企业信息单位类型或者取资质最小日期失败:{}", enterpriseInfo, e);
} }
} }
esBaseEnterpriseInfo.setUnitType(onlineJyjc ? enterpriseInfo.getUnitType() : RefreshCmService.updateJyjcUnitType(enterpriseInfo.getUnitType(), licenses));
enterpriseInfoDao.save(esBaseEnterpriseInfo); enterpriseInfoDao.save(esBaseEnterpriseInfo);
// 人员更新冗余的单位信息 // 人员更新冗余的单位信息
List<TzsUserInfo> userOfOneUnit = userInfoMapper.selectList(new LambdaQueryWrapper<TzsUserInfo>().eq(TzsUserInfo::getUnitCode, enterpriseInfo.getUseUnitCode()).eq(BaseEntity::getIsDelete, false).select(BaseEntity::getSequenceNbr)); List<TzsUserInfo> userOfOneUnit = userInfoMapper.selectList(new LambdaQueryWrapper<TzsUserInfo>().eq(TzsUserInfo::getUnitCode, enterpriseInfo.getUseUnitCode()).eq(BaseEntity::getIsDelete, false).select(BaseEntity::getSequenceNbr));
......
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