Merge branch 'v3' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3

src/main/java/com/huiju/estateagents/controller/TaPersonController.java

         TaPerson person = taPersons.get(0);
         QueryWrapper<TaPerson>queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("recommend_agent",person.getPersonId());
+        queryWrapper.eq("person_type", CommConstant.PERSON_ESTATE_AGENT);
         queryWrapper.eq("status",CommConstant.STATUS_NORMAL);
         Page<TaPerson>page = new Page<>();
         page.setPages(pageNum);

src/main/java/com/huiju/estateagents/service/impl/TaPersonServiceImpl.java

             QueryWrapper<TaRecommendCustomer> taRecommendCustomerQuery= new QueryWrapper<>();
             taRecommendCustomerQuery.eq("recommend_person",taPerson.getPersonId());
             taRecommendCustomerQuery.eq("status",1);
+            taRecommendCustomerQuery.eq("org_id", orgid);
             /*推荐客户总数*/
             int recommendCount= taRecommendCustomerMapper.selectCount(taRecommendCustomerQuery);
             taPerson.setRecommendCount(recommendCount);

src/main/resources/mapper/TaPersonMapper.xml

         select
         p.person_id,
         p.avatarurl,
-        p.tel,
         p.sex,
-        rc.`name`,
-        rc.phone,
+        rc.`name` as name,
+        rc.phone as tel,
         COUNT(rc.person_id) as recommendCount
         from ta_channel_person tch
         left join  ta_person p on  tch.person_id = p.person_id
-        LEFT JOIN ta_recommend_customer rc ON p.person_id = rc.person_id and rc.report_recommend_status = 1
+        LEFT JOIN ta_recommend_customer rc ON p.person_id = rc.person_id
         <where>
         <if test="name !=null and name !=''">
-            and rc.`name` = #{name}
+            and rc.name like CONCAT('%',#{name}, '%')
         </if>
         <if test="phone !=null and phone !=''">
-            and rc.phone = #{phone}
+            and rc.phone like CONCAT('%',#{phone}, '%')
         </if>
             and p.org_id= #{orgid}
             and tch.channel_id = #{channelId}