Merge remote-tracking branch 'origin/main'

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;
 }

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,
+        select ps.id as id,
-               sub_name as subName,
+        ps.sub_name as subName,
-               legal_person as legalPerson,
+        ps.legal_person as legalPerson,
-               legal_person_phone as legalPersonPhone,
+        ps.legal_person_phone as legalPersonPhone,
-               sub_address as subAddress,
+        ps.sub_address as subAddress,
-               business_license as businessLicense,
+        ps.business_license as businessLicense,
-               electronic_seal as electronicSeal,
+        ps.electronic_seal as electronicSeal,
-               id_card_front as idCardFront,
+        ps.id_card_front as idCardFront,
-               id_card_reverse as idCardReverse,
+        ps.id_card_reverse as idCardReverse,
-               corporate_seal as corporateSeal,
+        ps.corporate_seal as corporateSeal,
-               sub_ein_status as subEinStatus,
+        ps.sub_ein_status as subEinStatus,
-               sub_com_id as subComId
+        ps.sub_com_id as subComId,
-               from pm_sub where is_active='1'
+        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}, '%')
+            ps.sub_name like concat('%', #{keyWord}, '%')
-            or legal_person like concat('%', #{keyWord}, '%')
+            or ps.legal_person like concat('%', #{keyWord}, '%')
-            or legal_person_phone like concat('%', #{keyWord}, '%')
+            or ps.legal_person_phone like concat('%', #{keyWord}, '%')
-            or sub_address like concat('%', #{keyWord}, '%')
+            or ps.sub_address like concat('%', #{keyWord}, '%')
             )
         </if>
     </select>