diff --git a/src/com/engine/salary/biz/SIArchivesBiz.java b/src/com/engine/salary/biz/SIArchivesBiz.java index 07a965ef7..c03ef2a39 100644 --- a/src/com/engine/salary/biz/SIArchivesBiz.java +++ b/src/com/engine/salary/biz/SIArchivesBiz.java @@ -694,7 +694,7 @@ public class SIArchivesBiz { otherSchemeMapper.updateById(updateOtherInfo); //更新base_info表状态 InsuranceArchivesBaseInfoPO baseInfoPO = getInsuranceBaseInfoMapper().getOneByEmployeeIdAndPayOrg(param.getPaymentOrganization(), param.getEmployeeId()); - if(baseInfoPO != null && baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) { + if(baseInfoPO != null && baseInfoPO.getEmployeeType() != null && baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) { //对于非系统人员,编辑后状态切换为正在缴纳 baseInfoPO.setRunStatus(EmployeeStatusEnum.PAYING.getValue()); getInsuranceBaseInfoMapper().updateById(baseInfoPO); @@ -738,7 +738,7 @@ public class SIArchivesBiz { .build()); baseInfoPO.setOtherArchivesId(otherInfos.get(0).getId()); //对于非系统人员,编辑后状态切换为正在缴纳 - if (baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) { + if (baseInfoPO.getEmployeeType() != null && baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) { baseInfoPO.setRunStatus(EmployeeStatusEnum.PAYING.getValue()); } getInsuranceBaseInfoMapper().updateById(baseInfoPO); @@ -804,7 +804,7 @@ public class SIArchivesBiz { fundSchemeMapper.updateById(updateFundInfo); //更新base_info表状态 InsuranceArchivesBaseInfoPO baseInfoPO = getInsuranceBaseInfoMapper().getOneByEmployeeIdAndPayOrg(param.getPaymentOrganization(), param.getEmployeeId()); - if(baseInfoPO != null && baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) { + if(baseInfoPO != null && baseInfoPO.getEmployeeType() != null && baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) { //对于非系统人员,编辑后状态切换为正在缴纳 baseInfoPO.setRunStatus(EmployeeStatusEnum.PAYING.getValue()); getInsuranceBaseInfoMapper().updateById(baseInfoPO); @@ -850,7 +850,7 @@ public class SIArchivesBiz { .build()); baseInfoPO.setFundArchivesId(fundInfos.get(0).getId()); //对于非系统人员,编辑后状态切换为正在缴纳 - if (baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) { + if (baseInfoPO.getEmployeeType() != null && baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) { baseInfoPO.setRunStatus(EmployeeStatusEnum.PAYING.getValue()); } getInsuranceBaseInfoMapper().updateById(baseInfoPO); @@ -923,7 +923,7 @@ public class SIArchivesBiz { socialSchemeMapper.updateById(updateSocialInfo); //更新base_info表状态 InsuranceArchivesBaseInfoPO baseInfoPO = getInsuranceBaseInfoMapper().getOneByEmployeeIdAndPayOrg(param.getPaymentOrganization(), param.getEmployeeId()); - if(baseInfoPO != null && baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) { + if(baseInfoPO != null && baseInfoPO.getEmployeeType() != null && baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) { //对于非系统人员,编辑后状态切换为正在缴纳 baseInfoPO.setRunStatus(EmployeeStatusEnum.PAYING.getValue()); getInsuranceBaseInfoMapper().updateById(baseInfoPO); @@ -969,7 +969,7 @@ public class SIArchivesBiz { .build()); baseInfoPO.setSocialArchivesId(socialInfos.get(0).getId()); //对于非系统人员,编辑后状态切换为正在缴纳 - if (baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) { + if (baseInfoPO.getEmployeeType() != null && baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) { baseInfoPO.setRunStatus(EmployeeStatusEnum.PAYING.getValue()); } getInsuranceBaseInfoMapper().updateById(baseInfoPO);