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

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -247,7 +247,7 @@ FROM
         ( IFNULL( b.NAME, '' ) != '', b.NAME, b.nickname ) AS sharePersonName
         FROM
         ta_person b
-        LEFT JOIN ta_person_from_record r ON r.share_person_id = b.person_id
+        LEFT JOIN ta_person_from_record r ON r.share_person_id = b.person_id AND r.is_first_time = 1 and r.org_id = #{orgId}
         LEFT JOIN td_wx_dict d ON r.scene_id = d.scene_id
         <where>
             b.status > 0
@@ -565,7 +565,7 @@ FROM
                 and b.nickname like CONCAT('%',#{name}, '%')
             </if>
             <if test="buildingId != null and buildingId !=''">
-                AND r.building_id = #{buildingId}
+                AND b.building_id = #{buildingId}
             </if>
             <if test="personBuildingList != null and personBuildingList.size > 0">
                 AND r.building_id in