diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
index a6886a756..7ae527891 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
@@ -379,7 +379,9 @@
a.close_user_id as closeUserId,
a.close_time as closeTime,
a.join_black_reason as joinBlackReason
- from hy_partner_line_info a inner join hy_partner_user_info b on a.partner_id = b.partner_id
+ from hy_partner_line_info a
+ inner join hy_partner_user_info b on a.partner_id = b.partner_id
+ LEFT JOIN hy_open_area_info hoai ON hoai.id = b.want_shop_area
where a.deleted = 0
and a.line_status = 3
@@ -389,7 +391,7 @@
and b.mobile like concat('%', #{phoneKeyword}, '%')
- and b.want_shop_area like concat('%/',#{intentAreaName},'/%')
+ and hoai.area_path like concat('%/',#{intentAreaName},'/%')
and b.accept_adjust_type =#{acceptAdjustType}
@@ -429,7 +431,9 @@
b.username as userName,
b.want_shop_area as wantShopArea,
b.accept_adjust_type as acceptAdjustType
- FROM hy_partner_line_info a inner JOIN hy_partner_user_info b on a.partner_id = b.partner_id
+ FROM hy_partner_line_info a
+ inner JOIN hy_partner_user_info b on a.partner_id = b.partner_id
+ LEFT JOIN hy_open_area_info hoai ON hoai.id = b.want_shop_area
where a.line_status = 0 and a.deleted = 0
and b.username like concat('%',#{userNameKeyword},'%')
@@ -438,7 +442,7 @@
and b.mobile like concat('%',#{phoneKeyword},'%')
- and b.want_shop_area like concat('%/',#{intentAreaName},'/%')
+ and hoai.area_path like concat('%/',#{intentAreaName},'/%')
and b.accept_adjust_type = #{acceptAdjustType}
@@ -482,12 +486,14 @@
LEFT JOIN hy_partner_user_info hpuinfo ON hpli.partner_id = hpuinfo.partner_id
LEFT JOIN enterprise_user eu ON hpli.investment_manager = eu.user_id
LEFT JOIN hy_partner_interview_plan hpip on hpli.id = hpip.partner_line_id
- WHERE hpli.line_status in (1,2) and hpli.deleted = 0 and (hpip.deleted is null or hpip.deleted=0)
+ LEFT JOIN hy_open_area_info hoai ON hoai.id = hpuinfo.want_shop_area
+ WHERE hpli.line_status in (1,2)
+ AND ( hpli.deleted IS NULL OR hpli.deleted = 0 ) and (hpip.deleted is null or hpip.deleted=0)
AND (eu.name like concat('%',#{keyword},'%') or hpuinfo.username like concat('%',#{keyword},'%'))
- AND ( eu.mobile like concat('%',#{keyword},'%') or hpuinfo.mobile like concat('%',#{keyword},'%')')
+ AND ( eu.mobile like concat('%',#{keyword},'%') or hpuinfo.mobile like concat('%',#{keyword},'%'))
AND hpli.workflow_stage = #{workflowStage}
@@ -499,7 +505,7 @@
AND hpli.deadline BETWEEN #{deadlineStart} and #{deadlineStart}
- and hpuinfo.want_shop_area like concat('%/',#{intentAreaName},'/%')
+ and hoai.area_path like concat('%/',#{intentAreaName},'/%')
AND hpuinfo.accept_adjust_type = #{acceptAdjustType}