Merge branch 'fixbug/1026459' into 'master'

bug: [1026459] 过滤带小睿链接的精品文章作品

See merge request rays/pcloud-book!1087

pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/BookGroupBizImpl.java

@@ -5287,6 +5287,9 @@ public class BookGroupBizImpl implements BookGroupBiz {
                     } else {
                         bookServeDTO.setHasThirdLink(false);
                     }
+                    if (checkRayUrl(productDto.getSkipUrl()) && ProductTypeConstant.ARTICLE.equals(bookServeDTO.getFromType())){
+                        removeList.add(bookServeDTO);
+                    }
                 } else {
                     removeList.add(bookServeDTO);
                 }

pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/biz/impl/RightsSettingBizImpl.java

@@ -1556,6 +1556,9 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
                         } else {
                             item.setHasThirdLink(false);
                         }
+                        if (bookGroupBiz.checkRayUrl(productDto.getSkipUrl()) && ProductTypeConstant.ARTICLE.equals(item.getServeTypeCode())){
+                            list_remove.add(item);
+                        }
                     }
                 }
                 if (AppAndProductTypeEnum.APP.value.equals(item.getServeType())) {

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

@@ -77,6 +77,7 @@
           id, adviser_id, send_state, send_type, create_time, update_time, book_id, channel_id
         from book.answer_subscribe_adviser
         WHERE send_state = 0
+        AND adviser_id>0
         GROUP BY
             book_id, channel_id, adviser_id
     </select>

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

@@ -75,7 +75,7 @@
         FROM
             answer_subscribe
         WHERE
-            1=1
+            adviser_id>0
         GROUP BY
             book_id, channel_id, adviser_id
         HAVING