我的拼团

src/main/java/com/huiju/estateagents/entity/TaShareRecord.java

@@ -102,4 +102,13 @@ public class TaShareRecord implements Serializable {
     
     @TableField(exist = false)
     private LocalDateTime endDate;
+    
+    @TableField(exist = false)
+    private Integer id;
+    
+    /**
+     * 是否发起者
+     */
+    @TableField(exist = false)
+    private boolean groupStatus;
 }

src/main/resources/mapper/TaShareRecordMapper.xml

@@ -113,16 +113,49 @@
     </select>
     <select id="getShareRecordList" resultType="com.huiju.estateagents.entity.TaShareRecord">
         SELECT
-            t.*,
+            t.record_id AS id,
+            t.group_activity_id,
+            t.nickname,
+            t.phone,
+            t.avatarurl,
+            t.create_time,
+            t.end_time,
+            t.STATUS,
+            t.verification_status,
+            t.verification_code,
             a.activity_name,
             a.main_img,
             a.activity_status,
-            a.end_time AS end_date
+            a.end_time AS end_date,
+            1 as groupStatus
         FROM
             ta_share_record t
             LEFT JOIN ta_share_activity a ON t.group_activity_id = a.group_activity_id
         WHERE
             t.org_id = #{orgId}
             AND t.person_id = #{personId}
+	UNION ALL
+        SELECT
+            t.child_record_id AS id,
+            t.group_activity_id,
+            t.nickname,
+            t.phone,
+            t.avatarurl,
+            t.create_time,
+            t.end_time,
+            t.STATUS,
+            t.verification_status,
+            t.verification_code,
+            a.activity_name,
+            a.main_img,
+            a.activity_status,
+            a.end_time AS end_date,
+            0 as groupStatus
+        FROM
+            ta_share_child_record t
+            LEFT JOIN ta_share_activity a ON t.group_activity_id = a.group_activity_id
+        WHERE
+            t.org_id = #{orgId}
+            AND t.person_id = #{personId}
     </select>
 </mapper>