fix(system):单位返回值修改

mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/expenseAccount/ExpenseAccountApplicationService.java

@@ -581,7 +581,7 @@ public class ExpenseAccountApplicationService {
     }
 
     /**
-     * 根据编码和组织ID查询费用科目信息
+     * 根据编码和组织ID查询
      */
     public ExpenseAccountPO getInfoByOrgAndCode(String subjectCode, Long organizationId) {
         if(!StringUtils.isNotEmpty(subjectCode)){
@@ -590,7 +590,15 @@ public class ExpenseAccountApplicationService {
         if(organizationId == null){
             throw new ServiceException("组织ID不能为空");
         }
-        return expenseAccountDomainService.getInfoByOrgAndCode(subjectCode, organizationId);
+        ExpenseAccountPO expenseAccountPO = expenseAccountDomainService.getInfoByOrgAndCode(subjectCode, organizationId);
+        // 组装计费单位列表：单位-单位英文
+        List<String> unit = new ArrayList<>();
+        if (expenseAccountPO != null) {
+            unit.add(expenseAccountPO.getBillingUnit() + "-" + expenseAccountPO.getBillingUnitEn());
+            unit.add(expenseAccountPO.getBillingUnit2() + "-" + expenseAccountPO.getBillingUnitEn2());
+            expenseAccountPO.setUnit(unit);
+        }
+        return expenseAccountPO;
     }
 
     public List<QueryExpenseAccountPO> selectExpenseAccount(SearchExpenseAccountDO searchExpenseAccountDO){

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/expenseAccount/repository/po/ExpenseAccountPO.java

@@ -159,4 +159,8 @@ public class ExpenseAccountPO extends BaseVOEntity{
 
     @ApiModelProperty("nc科目编码")
     private String ncSubjectCode;
+
+    @ApiModelProperty("计费单位列表（单位-单位英文）")
+    private List<String> unit;
+
 }