From 182438e1dcbd11226652099c6935d0ef1fb7ae75 Mon Sep 17 00:00:00 2001
From: rcx <3084692334@qq.com>
Date: Wed, 26 Aug 2026 15:49:58 +0800
Subject: [PATCH] =?UTF-8?q?fix(system):=20=E8=B4=B9=E7=94=A8=E7=A7=91?=
 =?UTF-8?q?=E7=9B=AEgetInfoByOrgAndCode=E8=AE=A1=E8=B4=B9=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D=E4=B8=AD=E8=8B=B1=E6=96=87=E5=9D=87=E4=B8=BAnull?=
 =?UTF-8?q?=E6=97=B6=E8=BF=87=E6=BB=A4=EF=BC=8C=E9=81=BF=E5=85=8D=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9Enull-null?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ExpenseAccountApplicationService.java     | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/expenseAccount/ExpenseAccountApplicationService.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/expenseAccount/ExpenseAccountApplicationService.java
index 08586ea17..6bfb55e13 100644
--- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/expenseAccount/ExpenseAccountApplicationService.java
+++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/expenseAccount/ExpenseAccountApplicationService.java
@@ -594,22 +594,28 @@ public class ExpenseAccountApplicationService {
 //            unit.add(expenseAccountPO.getBillingUnit2() + "-" + expenseAccountPO.getBillingUnitEn2());
 //            expenseAccountPO.setUnit(unit);
 //        }
-        // 组装计费单位列表(数组)
+        // 组装计费单位列表(数组)，中文和英文都为null时过滤掉，避免出现"null-null"
         List<Map<String, String>> unit = new ArrayList<>();
         if (expenseAccountPO != null) {
-            Map<String, String> unit1 = new HashMap<>();
-            unit1.put("unit", expenseAccountPO.getBillingUnit() + "-" + expenseAccountPO.getBillingUnitEn());
-            unit.add(unit1);
-
-            Map<String, String> unit2 = new HashMap<>();
-            unit2.put("unit", expenseAccountPO.getBillingUnit2() + "-" + expenseAccountPO.getBillingUnitEn2());
-            unit.add(unit2);
-
+            addUnitIfPresent(unit, expenseAccountPO.getBillingUnit(), expenseAccountPO.getBillingUnitEn());
+            addUnitIfPresent(unit, expenseAccountPO.getBillingUnit2(), expenseAccountPO.getBillingUnitEn2());
             expenseAccountPO.setUnit(unit);
         }
         return expenseAccountPO;
     }
 
+    /**
+     * 组装计费单位，中文和英文都为null时不加入列表
+     */
+    private void addUnitIfPresent(List<Map<String, String>> unit, String billingUnit, String billingUnitEn) {
+        if (billingUnit == null && billingUnitEn == null) {
+            return;
+        }
+        Map<String, String> unitMap = new HashMap<>();
+        unitMap.put("unit", billingUnit + "-" + billingUnitEn);
+        unit.add(unitMap);
+    }
+
     public List<QueryExpenseAccountPO> selectExpenseAccount(SearchExpenseAccountDO searchExpenseAccountDO){
         setDataPermissionForSearch(searchExpenseAccountDO);
         return expenseAccountDomainService.selectExpenseAccount(searchExpenseAccountDO);