Merge branch 'master-bg-update' into base-modify

xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml

@@ -300,10 +300,15 @@
                 <foreach collection="companyIds" item="id" open="(" separator="," close=")">
                     #{id}
                 </foreach>
+                or
+                o1.end_company_id in
+                <foreach collection="companyIds" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
                 )
             </if>
             <if test="zoneId != null">
-                and o1.start_zone_id = #{zoneId}
+                and (bc1.zone_id = #{zoneId} or bc1.zone_id = #{zoneId})
             </if>
             <if test="zoneIds != null and zoneIds.size > 0">
                 and (o1.start_zone_id in