bugfix

src/main/resources/mapper/TaActivityDynamicEnlistMapper.xml

@@ -3,14 +3,18 @@
 <mapper namespace="com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper">
         <select id="signList" resultType="com.huiju.estateagents.entity.TaActivityDynamicEnlist">
 
-                SELECT
-                    tade.*,
-                    tp.NAME AS sharePersonName,
-                    tp.company 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.person_id
+            SELECT
+            tade.*,
+            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.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}