Merge commit '4f47b86599f4e6aad3b91ff7608d2aa2c8944825' into dev

# Conflicts:
#	src/main/resources/mapper/TaActivityDynamicEnlistMapper.xml
#	src/main/resources/mapper/TaPersonMapper.xml
#	src/main/resources/mapper/TaRecommendCustomerMapper.xml

src/main/resources/mapper/TaActivityDynamicEnlistMapper.xml

@@ -29,7 +29,7 @@
                         and tade.phone like CONCAT('%',#{phone}, '%')
                     </if>
                 </where>
-            GROUP BY tade.person_id
+            group by tade.person_id
 
         </select>
 
@@ -63,6 +63,7 @@
                 and tade.phone like CONCAT('%',#{phone}, '%')
             </if>
         </where>
+        group by tade.person_id
         limit #{pageCode}, #{pageSize}
     </select>
 </mapper>

src/main/resources/mapper/TaPersonMapper.xml

@@ -258,6 +258,7 @@ FROM
                ta_person tp
              LEFT JOIN
             ( SELECT *, MAX(visit_time) as max_visit_time FROM ta_person_visit_record where org_id = #{org} GROUP BY  person_id  ) as tpvr
+                ( SELECT *, MAX(visit_time) as max_visit_time FROM ta_person_visit_record where org_id = #{org} GROUP BY  person_id  ) as tpvr
             ON tp.person_id = tpvr.person_id
              where tp.org_id = #{org} AND tp.person_type IN ('customer','drift','estate agent')
              GROUP BY DATE_FORMAT( tpvr.max_visit_time , '%Y-%m-%d' )

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -111,12 +111,13 @@ FROM
         SELECT
         a.*,
         a.customer_id AS customerId,
-        b.NAME AS consultantName,
-        b.tel AS consultTel,
+        if(b.NAME  = null, d.name, b.name) as consultantName,
+        if(b.tel  = null, d.tel, b.tel) AS consultTel,
         c.building_name as intentionName
         FROM
         ta_recommend_customer a
-        LEFT JOIN ta_person b ON (a.realty_consultant = b.person_id or a.realty_consultant = b.user_id)
+        LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
+        LEFT JOIN ta_person d on a.realty_consultant = d.user_id
         LEFT JOIN ta_building c ON a.building_id = c.building_id
         <where>
             a.status > 0
@@ -553,6 +554,7 @@ FROM
         order by b.create_date desc
     </select>
 <!--    limit #{pageCode}, #{pageSize}-->
+
     <select id="getCustomerExportListCount" resultType="Integer" >
         SELECT
             count(1)
@@ -672,6 +674,7 @@ FROM
         order by a.create_date desc
     </select>
 <!--    limit #{pageCode}, #{pageSize}-->
+
     <select id="getMyCustStatistics" resultType="java.util.Map">
         SELECT
             sum( IF ( STATUS = 4 AND verify_status = 1, 1, 0 ) ) AS clinchSum,