bug----需要合到主分支

src/main/resources/mapper/TaActivityDynamicEnlistMapper.xml

@@ -12,7 +12,7 @@
             LEFT JOIN ta_share_person_from tspf ON tade.dynamic_id = tspf.target_id
             AND tspf.target_type = 'dynamic_share'
             AND tspf.STATUS = 1
-            AND tade.person_id = tspf.person_id
+            AND tade.person_id = tspf.person_id and tspf.is_first_time = 1
             LEFT JOIN ta_person tp ON tspf.share_person = tp.person_id AND tspf.share_person_type != 'Realty Consultant'
             LEFT JOIN ta_user tu ON tspf.share_person = tu.user_id AND tspf.share_person_type = 'Realty Consultant'
                 <where>
@@ -42,12 +42,13 @@
         SELECT
         tade.*,
         (CASE tade.is_checkin WHEN 1 THEN '已签到' ELSE '未签到'END) as isCheckin,
-        tp.NAME AS sharePersonName,
-        tp.company AS orgName
+        IFNULL(tp.nickname,tu.user_name) AS sharePersonName,
+        IFNULL(tp.company,tu.org_name)AS orgName
         FROM
         ta_activity_dynamic_enlist tade
-        LEFT JOIN ta_share_person_from tspf ON tade.dynamic_id = tspf.target_id AND tspf.target_type = 'dynamic_share' and tspf.status = 1 and tade.person_id = tspf.person_id
-        LEFT JOIN ta_person tp ON tspf.share_person = tp.user_id
+        LEFT JOIN ta_share_person_from tspf ON tade.dynamic_id = tspf.target_id AND tspf.target_type = 'dynamic_share' and tspf.status = 1 and tade.person_id = tspf.person_id and tspf.is_first_time = 1
+        LEFT JOIN ta_person tp ON tspf.share_person = tp.person_id AND tspf.share_person_type != 'Realty Consultant'
+        LEFT JOIN ta_user tu ON tspf.share_person = tu.user_id AND tspf.share_person_type = 'Realty Consultant'
         <where>
             tade.dynamic_id = #{dynamicId}
             AND tade.org_id = #{orgId}