魏超 преди 5 години
родител
ревизия
b6e000ab1c
променени са 1 файла, в които са добавени 4 реда и са изтрити 2 реда
  1. 4
    2
      src/main/resources/mapper/TaPersonVisitRecordMapper.xml

+ 4
- 2
src/main/resources/mapper/TaPersonVisitRecordMapper.xml Целия файл

128
 	        p.`nickname` as nickname,
128
 	        p.`nickname` as nickname,
129
 	        p.avatarurl
129
 	        p.avatarurl
130
         FROM
130
         FROM
131
-            ( 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
131
+            ( 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
132
             left JOIN ta_person p on t.person_id = p.person_id
132
             left JOIN ta_person p on t.person_id = p.person_id
133
             where t.person_id != #{personId}
133
             where t.person_id != #{personId}
134
         GROUP BY
134
         GROUP BY
351
     </select>
351
     </select>
352
 
352
 
353
     <select id="selectData" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
353
     <select id="selectData" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
354
-        select t.share_person_id, t.target_id,  t.event_type as target_type, a.nickname, a.avatarurl FROM
354
+		select t.share_person_id, t.target_id,
355
+		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,
356
+		a.nickname, a.avatarurl FROM
355
         ta_person_visit_record t
357
         ta_person_visit_record t
356
         LEFT JOIN ta_person a ON t.share_person_id = a.person_id
358
         LEFT JOIN ta_person a ON t.share_person_id = a.person_id
357
         LEFT JOIN ta_share_person_from b ON t.target_id = b.target_id  and t.event_type = b.target_type + '_share'
359
         LEFT JOIN ta_share_person_from b ON t.target_id = b.target_id  and t.event_type = b.target_type + '_share'