bug fix

src/main/resources/mapper/TaShareRecordMapper.xml

@@ -93,23 +93,41 @@
         </if> order by t.create_time desc
     </select>
     <select id="getShareRecordSuccessExportList" resultType="com.huiju.estateagents.excel.ShareRecordSuccessExport">
-        select
-        t.nickname,
-        t.phone,
-        t.create_time,
-        t.end_time,
-        t.verification_status
-        from ta_share_record t
-        where 1=1
-        <!--<if test="status != null and status != ''">-->
+        (
+            select
+            t.nickname,
+            t.phone,
+            t.create_time,
+            t.end_time,
+            t.verification_status
+            from ta_share_record t
+            where 1=1
             and t.status = #{status}
-        <!--</if>-->
-        <if test="recordId != null and recordId != ''">
-            and t.record_id = #{recordId}
-        </if>
-        <if test="groupActivityId != null and groupActivityId != ''">
-            and t.group_Activity_Id = #{groupActivityId}
-        </if>
+            <if test="recordId != null and recordId != ''">
+                and t.record_id = #{recordId}
+            </if>
+            <if test="groupActivityId != null and groupActivityId != ''">
+                and t.group_Activity_Id = #{groupActivityId}
+            </if>
+        )
+        union all
+        (
+            select
+            t.nickname,
+            t.phone,
+            t.create_time,
+            t.end_time,
+            t.verification_status
+            from ta_share_child_record t
+            where 1=1
+            and t.status = #{status}
+            <if test="recordId != null and recordId != ''">
+                and t.record_id = #{recordId}
+            </if>
+            <if test="groupActivityId != null and groupActivityId != ''">
+                and t.group_Activity_Id = #{groupActivityId}
+            </if>
+        )
         limit #{pageCode}, #{pageSize}
     </select>
     <select id="getShareRecordFailExportList" resultType="com.huiju.estateagents.excel.ShareRecordFailExport">