bug fix

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -128,7 +128,7 @@
 	        p.`nickname` as nickname,
 	        p.avatarurl
         FROM
-            ( SELECT * FROM ta_share_person_from WHERE org_id = #{orgId} and target_id = #{targetId} AND share_person = #{userId} and target_type = #{eventType} ORDER BY create_date DESC LIMIT 999) t
+            ( SELECT * FROM ta_share_person_from WHERE org_id = #{orgId} and target_id = #{targetId} AND (share_person = #{userId} or share_person = #{personId}) and target_type = #{eventType} ORDER BY create_date DESC LIMIT 999) t
             left JOIN ta_person p on t.person_id = p.person_id
             where t.person_id != #{personId}
         GROUP BY
@@ -351,7 +351,9 @@
     </select>
 
     <select id="selectData" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
-        select t.share_person_id, t.target_id,  t.event_type as target_type, a.nickname, a.avatarurl FROM
+		select t.share_person_id, t.target_id,
+		if(t.target_type = 'help' and t.event_type = 'activity', 'help', if(t.target_type = 'group' and t.event_type = 'activity' , 'group', t.event_type)) as target_type,
+		a.nickname, a.avatarurl FROM
         ta_person_visit_record t
         LEFT JOIN ta_person a ON t.share_person_id = a.person_id
         LEFT JOIN ta_share_person_from b ON t.target_id = b.target_id  and t.event_type = b.target_type + '_share'