From b6f019de22ae17101864573a3f7a7515a21e56c5 Mon Sep 17 00:00:00 2001
From: zhangzhiguo <421587375@qq.com>
Date: Sat, 11 Oct 2025 16:21:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E7=BB=B4=E5=BA=A6=E7=A7=91?=
 =?UTF-8?q?=E7=9B=AE=E4=BD=99=E9=A2=9D=E5=8F=96=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugin/common/SubjectbalanceAutoData.java | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

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<String, List<Map<String, String>>> accountAssgrp = new HashMap<>();
+                    List<Map<String, String>> 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<String, AccountRecord.AssGrpItem> 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);