Merge branch 'fixbug/bug1025855' into 'master'

bug: [1025855] 分类权益配置】存在已经选择的资讯内容为空的情况

See merge request rays/pcloud-book!989

pcloud-service-book/src/main/resources/mapper/applet/AppletNews.xml

@@ -640,11 +640,8 @@
     count(n.id) browseCount
     FROM applet_news n
     left join
-    applet_link_click c on n.id = c.from_id
+    applet_link_click c on n.id = c.from_id and type_id = 1 AND record_type = 2
     WHERE n.show_state = 1 and n.is_delete = 0
-    and
-    type_id = 1
-    AND record_type = 2
     AND n.id IN
     <foreach collection="list" item="item" separator="," open="(" close=")" >
       ${item}
@@ -1021,16 +1018,13 @@
         count(n.id) browseCount
         FROM applet_news n
         left join
-        applet_link_click c on n.id = c.from_id
+        applet_link_click c on n.id = c.from_id and type_id = 1 AND record_type = 2
         WHERE
-        type_id = 1
-        AND
-        record_type = 2
-        and
         n.id IN
         <foreach collection="list" item="item" separator="," open="(" close=")" >
             #{item}
         </foreach>
+        group by n.id
     </select>
 
 </mapper>