From 84d4df0809ced5f52e17e3c100d01faa8b04aee2 Mon Sep 17 00:00:00 2001
From: zhaoqing <1670883518@qq.com>
Date: Thu, 13 Aug 2026 10:31:49 +0800
Subject: [PATCH] =?UTF-8?q?fix(system):=E4=BF=AE=E6=94=B9=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D=E8=BF=94=E5=9B=9E=E5=80=BC=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ExpenseAccountApplicationService.java     | 27 ++++++++++++-------
 .../repository/po/ExpenseAccountPO.java       |  3 ++-
 .../expenseAccount/ExpenseAccountApi.java     |  2 +-
 3 files changed, 21 insertions(+), 11 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 8359c1e83..08586ea17 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
@@ -30,11 +30,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -591,11 +587,24 @@ public class ExpenseAccountApplicationService {
             throw new ServiceException("组织ID不能为空");
         }
         ExpenseAccountPO expenseAccountPO = expenseAccountDomainService.getInfoByOrgAndCode(subjectCode, organizationId);
-        // 组装计费单位列表：单位-单位英文
-        List<String> unit = new ArrayList<>();
+//        // 组装计费单位列表：单位-单位英文
+//        List<String> unit = new ArrayList<>();
+//        if (expenseAccountPO != null) {
+//            unit.add(expenseAccountPO.getBillingUnit() + "-" + expenseAccountPO.getBillingUnitEn());
+//            unit.add(expenseAccountPO.getBillingUnit2() + "-" + expenseAccountPO.getBillingUnitEn2());
+//            expenseAccountPO.setUnit(unit);
+//        }
+        // 组装计费单位列表(数组)
+        List<Map<String, String>> unit = new ArrayList<>();
         if (expenseAccountPO != null) {
-            unit.add(expenseAccountPO.getBillingUnit() + "-" + expenseAccountPO.getBillingUnitEn());
-            unit.add(expenseAccountPO.getBillingUnit2() + "-" + expenseAccountPO.getBillingUnitEn2());
+            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);
+
             expenseAccountPO.setUnit(unit);
         }
         return expenseAccountPO;
diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/expenseAccount/repository/po/ExpenseAccountPO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/expenseAccount/repository/po/ExpenseAccountPO.java
index 2f4f54d44..611f0751b 100644
--- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/expenseAccount/repository/po/ExpenseAccountPO.java
+++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/expenseAccount/repository/po/ExpenseAccountPO.java
@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
 
 import com.mhd.common.core.web.domain.BaseVOEntity;
 
@@ -161,6 +162,6 @@ public class ExpenseAccountPO extends BaseVOEntity{
     private String ncSubjectCode;
 
     @ApiModelProperty("计费单位列表（单位-单位英文）")
-    private List<String> unit;
+    private List<Map<String, String>> unit;
 
 }
\ No newline at end of file
diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facade/expenseAccount/ExpenseAccountApi.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facade/expenseAccount/ExpenseAccountApi.java
index 9d6d5d3bf..8c22cd084 100644
--- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facade/expenseAccount/ExpenseAccountApi.java
+++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facade/expenseAccount/ExpenseAccountApi.java
@@ -333,7 +333,7 @@ public class ExpenseAccountApi extends BaseController{
     public AjaxResult getInfoByOrgAndCode(@RequestParam("subjectCode") String subjectCode,@RequestParam("organizationId") Long organizationId)
     {
         ExpenseAccountPO expenseAccountPO = expenseAccountApplicationService.getInfoByOrgAndCode(subjectCode, organizationId);
-        return AjaxResult.success(expenseAccountPO);
+        return AjaxResult.success(expenseAccountPO.getUnit());
     }