diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java index aef9ef3c2..c7bb46933 100644 --- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java @@ -955,13 +955,13 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { record.put("socialPerCommonSum", commonSiAcct != null ? commonSiAcct.getSocialPerSum() : new BigDecimal("0")); record.put("socialComCommonSum", commonSiAcct != null ? commonSiAcct.getSocialComSum() : new BigDecimal("0")); //社保-补缴 - if (StringUtils.isNotEmpty(repairSiAcct.getSocialPerJson())) { + if (repairSiAcct != null && StringUtils.isNotEmpty(repairSiAcct.getSocialPerJson())) { Map socialJson = JSON.parseObject(repairSiAcct.getSocialPerJson(), new HashMap().getClass()); socialJson.forEach((k, v) -> { record.put(k + "socialRepairPer", v); }); } - if (StringUtils.isNotEmpty(repairSiAcct.getSocialComJson())) { + if (repairSiAcct != null && StringUtils.isNotEmpty(repairSiAcct.getSocialComJson())) { Map socialJson = JSON.parseObject(repairSiAcct.getSocialComJson(), new HashMap().getClass()); socialJson.forEach((k, v) -> { record.put(k + "socialRepairCom", v); @@ -970,13 +970,13 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { record.put("socialPerRepairSum", repairSiAcct != null ? repairSiAcct.getSocialPerSum() : new BigDecimal("0")); record.put("socialComRepairSum", repairSiAcct != null ? repairSiAcct.getSocialComSum() : new BigDecimal("0")); //社保-补差 - if (StringUtils.isNotEmpty(balanceSiAcct.getSocialPerJson())) { + if (balanceSiAcct != null && StringUtils.isNotEmpty(balanceSiAcct.getSocialPerJson())) { Map socialJson = JSON.parseObject(balanceSiAcct.getSocialPerJson(), new HashMap().getClass()); socialJson.forEach((k, v) -> { record.put(k + "socialBalancePer", v); }); } - if (StringUtils.isNotEmpty(balanceSiAcct.getSocialComJson())) { + if (balanceSiAcct != null && StringUtils.isNotEmpty(balanceSiAcct.getSocialComJson())) { Map socialJson = JSON.parseObject(balanceSiAcct.getSocialComJson(), new HashMap().getClass()); socialJson.forEach((k, v) -> { record.put(k + "socialBalanceCom", v); @@ -1001,13 +1001,13 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { record.put("fundPerCommonSum", commonSiAcct != null ? commonSiAcct.getFundPerSum() : new BigDecimal("0")); record.put("fundComCommonSum", commonSiAcct != null ? commonSiAcct.getFundComSum() : new BigDecimal("0")); //公积金-补缴 - if (StringUtils.isNotEmpty(repairSiAcct.getFundPerJson())) { + if (repairSiAcct != null && StringUtils.isNotEmpty(repairSiAcct.getFundPerJson())) { Map fundJson = JSON.parseObject(repairSiAcct.getFundPerJson(), new HashMap().getClass()); fundJson.forEach((k, v) -> { record.put(k + "fundRepairPer", v); }); } - if (StringUtils.isNotEmpty(repairSiAcct.getFundComJson())) { + if (repairSiAcct != null && StringUtils.isNotEmpty(repairSiAcct.getFundComJson())) { Map fundJson = JSON.parseObject(repairSiAcct.getFundComJson(), new HashMap().getClass()); fundJson.forEach((k, v) -> { record.put(k + "fundRepairCom", v); @@ -1016,13 +1016,13 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { record.put("fundPerRepairSum", repairSiAcct != null ? repairSiAcct.getFundPerSum() : new BigDecimal("0")); record.put("fundComRepairSum", repairSiAcct != null ? repairSiAcct.getFundComSum() : new BigDecimal("0")); //公积金-补差 - if (StringUtils.isNotEmpty(balanceSiAcct.getFundPerJson())) { + if (balanceSiAcct != null && StringUtils.isNotEmpty(balanceSiAcct.getFundPerJson())) { Map fundJson = JSON.parseObject(balanceSiAcct.getFundPerJson(), new HashMap().getClass()); fundJson.forEach((k, v) -> { record.put(k + "fundBalancePer", v); }); } - if (StringUtils.isNotEmpty(balanceSiAcct.getFundComJson())) { + if (balanceSiAcct != null && StringUtils.isNotEmpty(balanceSiAcct.getFundComJson())) { Map fundJson = JSON.parseObject(balanceSiAcct.getFundComJson(), new HashMap().getClass()); fundJson.forEach((k, v) -> { record.put(k + "fundBalanceCom", v); @@ -1047,13 +1047,13 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { record.put("otherPerCommonSum", commonSiAcct != null ? commonSiAcct.getOtherPerSum() : new BigDecimal("0")); record.put("otherComCommonSum", commonSiAcct != null ? commonSiAcct.getOtherComSum() : new BigDecimal("0")); //其他福利-补缴 - if (StringUtils.isNotEmpty(repairSiAcct.getOtherPerJson())) { + if (repairSiAcct != null && StringUtils.isNotEmpty(repairSiAcct.getOtherPerJson())) { Map otherJson = JSON.parseObject(repairSiAcct.getOtherPerJson(), new HashMap().getClass()); otherJson.forEach((k, v) -> { record.put(k + "otherRepairPer", v); }); } - if (StringUtils.isNotEmpty(repairSiAcct.getOtherComJson())) { + if (repairSiAcct != null && StringUtils.isNotEmpty(repairSiAcct.getOtherComJson())) { Map otherJson = JSON.parseObject(repairSiAcct.getOtherComJson(), new HashMap().getClass()); otherJson.forEach((k, v) -> { record.put(k + "otherRepairCom", v); @@ -1062,13 +1062,13 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { record.put("otherPerRepairSum", repairSiAcct != null ? repairSiAcct.getOtherPerSum() : new BigDecimal("0")); record.put("otherComRepairSum", repairSiAcct != null ? repairSiAcct.getOtherComSum() : new BigDecimal("0")); //其他福利-补差 - if (StringUtils.isNotEmpty(balanceSiAcct.getOtherPerJson())) { + if (balanceSiAcct != null && StringUtils.isNotEmpty(balanceSiAcct.getOtherPerJson())) { Map otherJson = JSON.parseObject(balanceSiAcct.getOtherPerJson(), new HashMap().getClass()); otherJson.forEach((k, v) -> { record.put(k + "otherBalancePer", v); }); } - if (StringUtils.isNotEmpty(balanceSiAcct.getOtherComJson())) { + if (balanceSiAcct != null && StringUtils.isNotEmpty(balanceSiAcct.getOtherComJson())) { Map otherJson = JSON.parseObject(balanceSiAcct.getOtherComJson(), new HashMap().getClass()); otherJson.forEach((k, v) -> { record.put(k + "otherBalanceCom", v);