Commit e51000ae by songyinghui

feature: 销售线索bug修复

parent cc8e1ffd
...@@ -243,6 +243,7 @@ ...@@ -243,6 +243,7 @@
left join tab_haoban_external_clerk_related related on related.staff_id = #{staffId} and related.status_flag in (1, 3, 4) and customer.member_id = related.member_id left join tab_haoban_external_clerk_related related on related.staff_id = #{staffId} and related.status_flag in (1, 3, 4) and customer.member_id = related.member_id
</if> </if>
<if test="bizIds != null and bizIds.size > 0"> <if test="bizIds != null and bizIds.size > 0">
<!-- 按素材 -->
INNER JOIN ( INNER JOIN (
SELECT `enterprise_id`,`clerk_id`,`member_id` SELECT `enterprise_id`,`clerk_id`,`member_id`
FROM tab_haoban_interact_record FROM tab_haoban_interact_record
...@@ -266,7 +267,7 @@ ...@@ -266,7 +267,7 @@
<if test="enterpriseId != null and enterpriseId != ''"> <if test="enterpriseId != null and enterpriseId != ''">
and customer.enterprise_id = #{enterpriseId} and customer.enterprise_id = #{enterpriseId}
</if> </if>
<if test="search != null and search != ''"> <if test="search != null and search != '' and searchType != null and searchType == 1">
<!-- 姓名、昵称、手机号 --> <!-- 姓名、昵称、手机号 -->
and ( customer.member_name like concat('%', #{search}, '%') or customer.member_nick_name like concat('%', #{search}, '%') or customer.member_phone like concat('%', #{search}, '%') ) and ( customer.member_name like concat('%', #{search}, '%') or customer.member_nick_name like concat('%', #{search}, '%') or customer.member_phone like concat('%', #{search}, '%') )
</if> </if>
......
...@@ -53,6 +53,8 @@ public class PotentialCustomerServiceTest { ...@@ -53,6 +53,8 @@ public class PotentialCustomerServiceTest {
potentialCustomerQO.setWxEnterpriseId(wxEid); potentialCustomerQO.setWxEnterpriseId(wxEid);
potentialCustomerQO.setClerkId(clerkId); potentialCustomerQO.setClerkId(clerkId);
potentialCustomerQO.setHasMemberRelation(1); potentialCustomerQO.setHasMemberRelation(1);
potentialCustomerQO.setSearchType(2);
potentialCustomerQO.setSearch("红");
Page<PotentialCustomerBO> customerBOPage = Page<PotentialCustomerBO> customerBOPage =
potentialCustomerService.queryPotentialCustomerPage(potentialCustomerQO); potentialCustomerService.queryPotentialCustomerPage(potentialCustomerQO);
System.out.println(JSON.toJSONString(customerBOPage)); System.out.println(JSON.toJSONString(customerBOPage));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment