Merge branch 'hurx'

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/domain/PartnerBank.java

@@ -42,6 +42,12 @@ public class PartnerBank extends TenantEntity {
      */
     private String registrationNumber;
 
+
+    /**
+     * 开户银行ID
+     */
+    private Long bankId;
+
     /**
      * 开户银行名称
      */

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/domain/bo/PartnerBankBo.java

@@ -40,6 +40,11 @@ public class PartnerBankBo extends BaseEntity {
      */
     private String registrationNumber;
 
+    /**
+     * 开户银行ID
+     */
+    private Long bankId;
+
     /**
      * 开户银行名称
      */

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/domain/vo/PartnerBankVo.java

@@ -13,7 +13,6 @@ import java.io.Serializable;
 import java.util.Date;
 
 
-
 /**
  * 伙伴商银行账户视图对象 partner_bank
  *
@@ -53,6 +52,11 @@ public class PartnerBankVo implements Serializable {
     @ExcelProperty(value = "财务登记号")
     private String registrationNumber;
 
+    /**
+     * 开户银行ID
+     */
+    private Long bankId;
+
     /**
      * 开户银行名称
      */

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/ComWarehouseServiceImpl.java

@@ -71,13 +71,15 @@ public class ComWarehouseServiceImpl extends ServiceImpl<ComWarehouseMapper, Com
                 .filter(Objects::nonNull)
                 .collect(Collectors.toSet());
 
-            Map<Long, String> companyMap = companyMapper.selectBatchIds(companyIds).stream()
-                .collect(Collectors.toMap(
-                    ComCompany::getId,
-                    ComCompany::getCompanyName,
-                    (oldVal, newVal) -> newVal,
-                    HashMap::new
-                ));
+            Map<Long, String> companyMap = !companyIds.isEmpty() ?
+                companyMapper.selectBatchIds(companyIds).stream()
+                    .collect(Collectors.toMap(
+                        ComCompany::getId,
+                        ComCompany::getCompanyName,
+                        (oldVal, newVal) -> newVal, // 冲突时保留新值
+                        HashMap::new
+                    ))
+                : Collections.emptyMap();
 
             records.forEach(vo ->
                 vo.setCompanyName(companyMap.get(vo.getCompanyId()))