Merge remote-tracking branch 'origin/dev' into dev

src/main/resources/mapper/TaBuildingMapper.xml

         b.STATUS > 0
         AND b.org_id = #{orgId}
         AND IFNULL( b.person_type, '' ) IN ( 'estate agent', 'customer' )
-        AND b.person_id NOT IN ( SELECT c.person_id FROM ta_recommend_customer c WHERE c.org_id = 84 AND person_id IS NOT NULL AND person_id != '' )
+        AND b.person_id NOT IN ( SELECT c.person_id FROM ta_recommend_customer c WHERE c.org_id = #{orgId} AND person_id IS NOT NULL AND person_id != '' )
         <if test="startDate != null">
             and  TO_DAYS(b.create_date) >= TO_DAYS(#{startDate})
         </if>
         u.be_uv AS building_id
         FROM
         ta_uv u
+        LEFT JOIN ta_person p ON u.person_id = p.person_id
         WHERE
         u.tagert_type = 'project'
+        AND p.org_id = #{orgId}
         <if test="startDate != null">
             and  TO_DAYS(u.create_date) >= TO_DAYS(#{startDate})
         </if>