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

# Conflicts:
#	src/main/resources/mapper/TaHousingResourcesMapper.xml
#	src/main/resources/mapper/TaRaiseRecordMapper.xml

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -175,12 +175,9 @@
             left join ta_help_activity tha on t.target_id = tha.help_activity_id
             left join ta_share_activity tsa on t.target_id = tsa.group_activity_id
             left join ta_building_dynamic tbd on t.target_id = tbd.dynamic_id
-            left join ta_person c on (t.share_person = c.person_id or t.share_person = c.user_id)
-            where 1=1
+            left join ta_person c on t.org_id = c.org_id and (t.share_person = c.person_id or t.share_person = c.user_id)
+            where t.org_id = #{orgId}
             and t.target_type in ('h5_share','group_share','help_share','news_share','dynamic_share','building_share')
-            <if test="orgId != null and orgId != ''">
-                and c.org_id = #{orgId}
-            </if>
             <if test="eventType !=null and eventType != ''">
                 and t.target_type = #{eventType}
             </if>