Merge remote-tracking branch 'origin/base-modify' into base-modify

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BackgroundBaseOrderBiz.java

@@ -59,6 +59,10 @@ public class BackgroundBaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder>
 				companyIds.add(dto.getStartCompanyId());
 			}
 		}
+		//有当前大区权限才能搜索到数据
+		if (dto.getZoneId() != null && (userDTO.getDataAll() == 1 || userDTO.getZoneId().equals(dto.getZoneId()) || userDTO.getDataZone().contains(dto.getZoneId()+""))) {
+			companyIds.clear();
+		}
 		dto.setCompanyIds(companyIds);
 		if (dto.getStartTime() != null) {
 			if (dto.getEndTime() == null) {

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

@@ -303,10 +303,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