From 0e2fd80b73595e6d160799adf48529f7b922f6bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com>
Date: Wed, 19 Nov 2025 11:06:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bonus/bmw/domain/po/PmSub.java   |  5 +++
 .../main/resources/mapper/bmw/PmSubMapper.xml | 39 ++++++++++---------
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/PmSub.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/PmSub.java
index 34cec17..b3b6a74 100644
--- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/PmSub.java
+++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/PmSub.java
@@ -135,4 +135,9 @@ public class PmSub {
      * 分公司id
      */
     private String  subComId;
+
+    /**
+     * 分公司名称
+     */
+    private String  subComName;
 }
diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubMapper.xml
index 426e7ab..d879b1f 100644
--- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubMapper.xml
+++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubMapper.xml
@@ -58,28 +58,31 @@
     </delete>
 
     <select id="selectSubList" resultType="com.bonus.bmw.domain.po.PmSub">
-        select id as id,
-               sub_name as subName,
-               legal_person as legalPerson,
-               legal_person_phone as legalPersonPhone,
-               sub_address as subAddress,
-               business_license as businessLicense,
-               electronic_seal as electronicSeal,
-               id_card_front as idCardFront,
-               id_card_reverse as idCardReverse,
-               corporate_seal as corporateSeal,
-               sub_ein_status as subEinStatus,
-               sub_com_id as subComId
-               from pm_sub where is_active='1'
+        select ps.id as id,
+        ps.sub_name as subName,
+        ps.legal_person as legalPerson,
+        ps.legal_person_phone as legalPersonPhone,
+        ps.sub_address as subAddress,
+        ps.business_license as businessLicense,
+        ps.electronic_seal as electronicSeal,
+        ps.id_card_front as idCardFront,
+        ps.id_card_reverse as idCardReverse,
+        ps.corporate_seal as corporateSeal,
+        ps.sub_ein_status as subEinStatus,
+        ps.sub_com_id as subComId,
+        psc.sub_company_name as subComName
+               from pm_sub ps
+               left join pm_sub_company psc on ps.sub_com_id = psc.id
+               where is_active='1'
         <if test="subComId!= null " >
-            and sub_com_id=#{subComId}
+            and ps.sub_com_id=#{subComId}
         </if>
         <if test="keyWord !=null and keyWord!= ''" >
             and (
-            sub_name like concat('%', #{keyWord}, '%')
-            or legal_person like concat('%', #{keyWord}, '%')
-            or legal_person_phone like concat('%', #{keyWord}, '%')
-            or sub_address like concat('%', #{keyWord}, '%')
+            ps.sub_name like concat('%', #{keyWord}, '%')
+            or ps.legal_person like concat('%', #{keyWord}, '%')
+            or ps.legal_person_phone like concat('%', #{keyWord}, '%')
+            or ps.sub_address like concat('%', #{keyWord}, '%')
             )
         </if>
     </select>