diff --git a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/common/SubjectbalanceAutoData.java b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/common/SubjectbalanceAutoData.java index 2ddefaa..0e25678 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/common/SubjectbalanceAutoData.java +++ b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/common/SubjectbalanceAutoData.java @@ -122,6 +122,13 @@ public class SubjectbalanceAutoData { } balanceQueryParamApi.setAccountAssgrp(accountAssgrp); groupBy.add(asseestype); + }else{ + Map>> accountAssgrp = new HashMap<>(); + List> li = new ArrayList<>(); + for (String accNum : accountNumber) { + accountAssgrp.put(accNum, li); + } + balanceQueryParamApi.setAccountAssgrp(accountAssgrp); } groupBy.add("account"); balanceQueryParamApi.setGroupBys(groupBy); @@ -155,15 +162,17 @@ public class SubjectbalanceAutoData { assistbalance.set("zcgj_sourcetype", asseestype); Map assgrp = record.getAssgrp(); - if (assgrp.containsKey("0032")) { - if (assgrp.get("0032") != null) { - assistbalance.set("zcgj_processnumber", assgrp.get("0032").getNumber()); - assistbalance.set("zcgj_processname", assgrp.get("0032").getName()); - } - } else if (assgrp.containsKey("0017")) { - if (assgrp.get("0017") != null) { - assistbalance.set("zcgj_costcompanynumber", assgrp.get("0017").getNumber()); - assistbalance.set("zcgj_costcompanyname", assgrp.get("0017").getName()); + if(assgrp!=null){ + if (assgrp.containsKey("0032")) { + if (assgrp.get("0032") != null) { + assistbalance.set("zcgj_processnumber", assgrp.get("0032").getNumber()); + assistbalance.set("zcgj_processname", assgrp.get("0032").getName()); + } + } else if (assgrp.containsKey("0017")) { + if (assgrp.get("0017") != null) { + assistbalance.set("zcgj_costcompanynumber", assgrp.get("0017").getNumber()); + assistbalance.set("zcgj_costcompanyname", assgrp.get("0017").getName()); + } } } addEntities.add(assistbalance);