解决查询重复记录问题

pcloud-service-book/src/main/resources/mapper/adnews/AdNewsGroupRecordMapper.xml

@@ -32,15 +32,16 @@
         SELECT
             a.id,
             a.ad_news_id adNewsId,
-            c.wechat_name wechatName,
-            b.title,
-            b.short_url shortUrl,
+            d.wechat_name wechatName,
+            c.title,
+            c.short_url shortUrl,
             a.custom_content customContent,
             a.content_type contentType
         FROM
             ad_news_group_record a
-            LEFT JOIN ad_news b ON a.ad_news_id=b.id
-            LEFT JOIN ad_news_wechat c ON b.news_from=c.news_from
+            INNER JOIN ad_news_message_statistic b ON a.message_statistic_id=b.id
+            LEFT JOIN ad_news c ON a.ad_news_id=c.id
+            LEFT JOIN ad_news_wechat d ON d.news_from=c.news_from AND ((b.content_from=2 AND d.adviser_id=#{partyId,jdbcType=BIGINT}) OR b.content_from <![CDATA[<>]]> 2)
         WHERE a.message_statistic_id=#{messageStatisticId,jdbcType=BIGINT}
             AND a.create_user=#{partyId,jdbcType=BIGINT}
     </select>

pcloud-service-book/src/main/resources/mapper/adnews/AdNewsMapper.xml

@@ -133,7 +133,7 @@
         a.id, a.type, a.news_from, a.title, a.publisher, a.url, a.short_url, a.news_date, a.create_time
         FROM
         ad_news a
-        INNER JOIN ad_news_wechat b ON a.news_from = b.news_from AND b.is_delete = 0
+        INNER JOIN ad_news_wechat b ON a.news_from = b.news_from AND b.is_delete = 0 AND b.adviser_id=#{adviserId}
         WHERE
         NOT EXISTS ( SELECT 1 FROM ad_news_ban e WHERE a.id = e.ad_news_id AND e.adviser_id = #{adviserId} )
         AND NOT EXISTS (SELECT 1 from ad_news_group_record f WHERE f.ad_news_id=a.id and f.ad_news_set_id=#{adNewsSetId})