Merge branch 'feat-zyq-fix2' into 'master'

匹配资讯

See merge request rays/pcloud-book!732

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

@@ -1205,7 +1205,14 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
         // 加载平台端自己选择的社群、方案、资讯等数据
         fillRightsSettingItemDetail(list);
         // 筛选出没有选择 社群、方案、资讯 的数据
-        List<RightsSettingItem> needFillAppletNews = list.stream().filter(x -> x.getServeType() == null).collect(Collectors.toList());
+        List<RightsSettingItem> needFillAppletNews = Lists.newArrayList();
+        for(RightsSettingItem rightsSettingItem : list){
+            if(rightsSettingItem.getServeType() == null
+                    || RightsServeTypeEnum.GROUP.name().equalsIgnoreCase(rightsSettingItem.getServeType()) && ListUtils.isEmpty(rightsSettingItem.getGroupActivity4AppletList())
+                    || RightsServeTypeEnum.NEWS.name().equalsIgnoreCase(rightsSettingItem.getServeType()) && ListUtils.isEmpty(rightsSettingItem.getAppletNewsDTOS())) {
+                needFillAppletNews.add(rightsSettingItem);
+            }
+        }
         if(ListUtils.isEmpty(needFillAppletNews)){
             return list;
         }

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

@@ -58,9 +58,9 @@
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
-        insert into book.rights_setting_item(rights_setting_id, rights_type, rights_classify_id, description, create_time,title,uuid,open_state,serve_type,
+        insert into book.rights_setting_item(rights_setting_id, rights_type, rights_classify_id, description, create_time,title,uuid,open_state,service_desc,serve_type,
         easy_read,efficient_read,deep_read)
-        values (#{rightsSettingId}, #{rightsType}, #{rightsClassifyId}, #{description}, NOW(), #{title},#{uuid},#{openState},#{serveType},
+        values (#{rightsSettingId}, #{rightsType}, #{rightsClassifyId}, #{description}, NOW(), #{title},#{uuid},#{openState},#{serviceDesc},#{serveType},
         #{easyRead},#{efficientRead},#{deepRead})
     </insert>
 
@@ -76,7 +76,7 @@
     <!--批量新增-->
     <insert id="batchInsert" useGeneratedKeys="true" parameterType="java.util.List">
         insert into book.rights_setting_item (
-        rights_setting_id, rights_type, rights_classify_id, description, create_time,title,uuid,open_state,serve_type,
+        rights_setting_id, rights_type, rights_classify_id, description, create_time,title,uuid,open_state,service_desc,serve_type,
         easy_read,efficient_read,deep_read
         )
         values
@@ -90,6 +90,7 @@
             #{item.title},
             #{item.uuid},
             #{item.openState},
+            #{item.serviceDesc},
             #{item.serveType},
             #{item.easyRead},#{item.efficientRead},#{item.deepRead}
             )