diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java index 95042d4c6..28284861f 100644 --- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java @@ -955,32 +955,32 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { InsuranceAccountDetailPO repairSiAcct = siAcctResultWithEmpAndPayStatus.get(item.getEmployeeId() + "_" + PaymentStatusEnum.REPAIR.getValue()); InsuranceAccountDetailPO balanceSiAcct = siAcctResultWithEmpAndPayStatus.get(item.getEmployeeId() + "_" + PaymentStatusEnum.BALANCE.getValue()); //取正常缴纳的福利基数信息 - if (StringUtils.isNotEmpty(commonSiAcct.getSocialPaymentBaseString())) { + if (commonSiAcct != null && StringUtils.isNotEmpty(commonSiAcct.getSocialPaymentBaseString())) { Map socialBaseJson = JSON.parseObject(commonSiAcct.getSocialPaymentBaseString(), new HashMap().getClass()); socialBaseJson.forEach((k, v) -> { record.put(k + "socialBase", v); }); } - if (StringUtils.isNotEmpty(commonSiAcct.getFundPaymentBaseString())) { + if (commonSiAcct != null && StringUtils.isNotEmpty(commonSiAcct.getFundPaymentBaseString())) { Map fundBaseJson = JSON.parseObject(commonSiAcct.getFundPaymentBaseString(), new HashMap().getClass()); fundBaseJson.forEach((k, v) -> { record.put(k + "fundBase", v); }); } - if (StringUtils.isNotEmpty(commonSiAcct.getOtherPaymentBaseString())) { + if (commonSiAcct != null && StringUtils.isNotEmpty(commonSiAcct.getOtherPaymentBaseString())) { Map otherBaseJson = JSON.parseObject(commonSiAcct.getOtherPaymentBaseString(), new HashMap().getClass()); otherBaseJson.forEach((k, v) -> { record.put(k + "otherBase", v); }); } //社保-正常缴纳 - if (StringUtils.isNotEmpty(commonSiAcct.getSocialPerJson())) { + if (commonSiAcct != null && StringUtils.isNotEmpty(commonSiAcct.getSocialPerJson())) { Map socialJson = JSON.parseObject(commonSiAcct.getSocialPerJson(), new HashMap().getClass()); socialJson.forEach((k, v) -> { record.put(k + "socialCommonPer", v); }); } - if (StringUtils.isNotEmpty(commonSiAcct.getSocialComJson())) { + if (commonSiAcct != null && StringUtils.isNotEmpty(commonSiAcct.getSocialComJson())) { Map socialJson = JSON.parseObject(commonSiAcct.getSocialComJson(), new HashMap().getClass()); socialJson.forEach((k, v) -> { record.put(k + "socialCommonCom", v); @@ -1020,13 +1020,13 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { record.put("socialComBalanceSum", balanceSiAcct != null ? balanceSiAcct.getSocialComSum() : new BigDecimal("0")); //公积金-正常缴纳 - if (StringUtils.isNotEmpty(commonSiAcct.getFundPerJson())) { + if (commonSiAcct != null && StringUtils.isNotEmpty(commonSiAcct.getFundPerJson())) { Map socialJson = JSON.parseObject(commonSiAcct.getFundPerJson(), new HashMap().getClass()); socialJson.forEach((k, v) -> { record.put(k + "fundCommonPer", v); }); } - if (StringUtils.isNotEmpty(commonSiAcct.getFundComJson())) { + if (commonSiAcct != null && StringUtils.isNotEmpty(commonSiAcct.getFundComJson())) { Map socialJson = JSON.parseObject(commonSiAcct.getFundComJson(), new HashMap().getClass()); socialJson.forEach((k, v) -> { record.put(k + "fundCommonCom", v); @@ -1066,13 +1066,13 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { record.put("fundComBalanceSum", balanceSiAcct != null ? balanceSiAcct.getFundComSum() : new BigDecimal("0")); //其他福利-正常缴纳 - if (StringUtils.isNotEmpty(commonSiAcct.getOtherPerJson())) { + if (commonSiAcct != null && StringUtils.isNotEmpty(commonSiAcct.getOtherPerJson())) { Map otherJson = JSON.parseObject(commonSiAcct.getOtherPerJson(), new HashMap().getClass()); otherJson.forEach((k, v) -> { record.put(k + "otherCommonPer", v); }); } - if (StringUtils.isNotEmpty(commonSiAcct.getOtherComJson())) { + if (commonSiAcct != null && StringUtils.isNotEmpty(commonSiAcct.getOtherComJson())) { Map otherJson = JSON.parseObject(commonSiAcct.getOtherComJson(), new HashMap().getClass()); otherJson.forEach((k, v) -> { record.put(k + "otherCommonCom", v);