Merge branch 'fixbug/1025061' into 'master'

bug: [1025061] fixNews

See merge request rays/pcloud-book!896

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

@@ -39,6 +39,33 @@
      pic1, pic2, pic3, news.content, show_state, news.create_time, news.update_time, news.first_classify, news.second_classify, news.grade_label_id, news.subject_label_id, news.rights_classify_id,
      news.jump_type, news.jump_url, news.url_number, news.custom_tag_id, news.show_source, news.show_link,news.business_card_id,news.business_card_type,news.business_card_isOpen
   </sql>
+    <sql id="sql_news">
+      m.id,
+    newsName,
+    source,
+    newsClassifyId,
+    proLabelId,
+    depLabelId,
+    purLabelId,
+    m.type,
+    m.digest,
+    m.pic1,
+    m.pic2,
+    m.pic3,
+    m.content,
+    showState,
+    createTime,
+    firstClassify,
+    secondClassify,
+    gradeLabelId,
+    subjectLabelId,
+    rightsClassifyId,
+    jumpType,
+    jumpUrl,
+    urlNumber,
+    showSource,
+    showLink
+    </sql>
 
   <insert id="insert" parameterType="com.pcloud.book.applet.entity.AppletNews" useGeneratedKeys="true" keyProperty="id">
     insert into applet_news(
@@ -691,7 +718,10 @@
     </select>
 
   <select id="getClassifyNewsByTempletLabel" parameterType="map" resultType="com.pcloud.book.applet.dto.AppletNewsDTO">
-    SELECT
+      select
+      <include refid="sql_news"/>
+       from (
+      select distinct
       n.id,
       n.news_name newsName,
       n.source,
@@ -745,7 +775,8 @@
       <if test="efficientRead!=null">
         AND i.efficient_read = #{efficientRead}
       </if>
-    ORDER BY n.update_time DESC
+    ORDER BY n.update_time DESC) m
+
   </select>
 
   <insert id="batchInsert" parameterType="com.pcloud.book.applet.entity.AppletNews" useGeneratedKeys="true"

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

@@ -144,7 +144,7 @@
         AND t.adviser_id >= 1
         AND t.wechat_user_id = #{wechatUserId}
         ORDER BY
-            t.create_time DESC
+            t.create_time DESC, t1.id desc
         LIMIT 1
     </select>