diff --git a/src/com/engine/salary/biz/SIAccountBiz.java b/src/com/engine/salary/biz/SIAccountBiz.java index 024d6d13b..8cb803281 100644 --- a/src/com/engine/salary/biz/SIAccountBiz.java +++ b/src/com/engine/salary/biz/SIAccountBiz.java @@ -1450,8 +1450,8 @@ public class SIAccountBiz extends Service { accountSocialView(insuranceAccountViewListDTO, v); }); //根据组织分组,对公积金进行统计 - Map> fundCollect = list.stream().filter(item -> item.getFundPayOrg() != null) - .collect(Collectors.groupingBy(InsuranceAccountDetailPO::getFundPayOrg)); + Map> fundCollect = list.stream().filter(item -> item.getSocialPayOrg() != null) + .collect(Collectors.groupingBy(InsuranceAccountDetailPO::getSocialPayOrg)); fundCollect.forEach((k, v) -> { if (result.get(k) == null) { InsuranceAccountViewListDTO temp = new InsuranceAccountViewListDTO(); @@ -1462,8 +1462,8 @@ public class SIAccountBiz extends Service { accountFundView(insuranceAccountViewListDTO, v); }); //根据组织分组,对其他福利进行统计 - Map> otherCollect = list.stream().filter(item -> item.getOtherPayOrg() != null) - .collect(Collectors.groupingBy(InsuranceAccountDetailPO::getOtherPayOrg)); + Map> otherCollect = list.stream().filter(item -> item.getSocialPayOrg() != null) + .collect(Collectors.groupingBy(InsuranceAccountDetailPO::getSocialPayOrg)); otherCollect.forEach((k, v) -> { if (result.get(k) == null) { InsuranceAccountViewListDTO temp = new InsuranceAccountViewListDTO(); diff --git a/src/com/engine/salary/entity/siaccount/po/InsuranceAccountDetailPO.java b/src/com/engine/salary/entity/siaccount/po/InsuranceAccountDetailPO.java index b1ed7db6e..a98d50e1b 100644 --- a/src/com/engine/salary/entity/siaccount/po/InsuranceAccountDetailPO.java +++ b/src/com/engine/salary/entity/siaccount/po/InsuranceAccountDetailPO.java @@ -21,6 +21,7 @@ import java.util.Date; @NoArgsConstructor @AllArgsConstructor @SalaryTable(pageId = "2394fba1-1381-428a-8532-4e1e6b86626e", tableType = WeaTableType.CHECKBOX) +//hrsa_bill_detail public class InsuranceAccountDetailPO { /** diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java index dce4b3b53..3745d2bd9 100644 --- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java @@ -327,6 +327,8 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { @Override public void saveSupplementaryAccount(SaveSupplementaryAccountParam saveSupplementaryAccountParam) { + ValidUtil.doValidator(saveSupplementaryAccountParam); + Long employeeId = (long)user.getUID(); String currentUserName = user.getLastname(); getSiAccountBiz(user).saveSupplementaryAccount(saveSupplementaryAccountParam,employeeId,currentUserName);