Merge branch 'fixbug/serve' into 'master'

bug: [1028403] 页面显示有资源，但是进入小睿本书服务，显示没有资源

See merge request rays/pcloud-book!1233

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

@@ -256,5 +256,5 @@ public interface RightsSettingBiz {
      * @date：2021/2/19 17:42
      *  * @param null
      */
-        List<BookServeDTO> getRightsSettingAppProduct(Long bookId, Long channelId, Long adviserId, Integer limit);
+     List<BookServeDTO> getRightsSettingAppProduct(Long bookId, Long channelId, Long adviserId, Integer limit);
 }

pcloud-service-book/src/main/resources/mapper/rightssetting/RightNowItem.xml

@@ -342,17 +342,21 @@
 
     <select id="getServeItemsByServeTypes" parameterType="map" resultType="com.pcloud.book.group.dto.BookServeDTO">
         SELECT
-        serve_id serveId,
-        serve_type serveType,
-        link_url url
+        i.serve_id serveId,
+        i.serve_type serveType,
+        i.link_url url
         FROM
-        rights_now_item
+        rights_now_item i
+        LEFT JOIN rights_setting_title t ON i.rights_setting_title_id = t.id
         WHERE
-        rights_setting_id = #{rightsSettingId}
-        AND serve_type IN
+        i.rights_setting_id = #{rightsSettingId}
+        AND i.serve_type IN
         <foreach collection="serveTypes" open="(" close=")" item="item" index="index" separator=",">
             #{item}
         </foreach>
+        AND t.open_state = 1
+        GROUP BY
+        i.serve_id
         <if test="limit > 0">
             LIMIT #{limit}
         </if>