Merge branch 'fixbug/1024266' into 'master'

bug: [1024266] 【生产环境】【小程序端】【技能配置】社群模板，在编辑端删除已选择的编辑群，小程序显示空白并报错

See merge request rays/pcloud-book!802

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

@@ -1124,9 +1124,6 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
             }
             if (item.getServeId() != null && RightsServeTypeEnum.GROUP.name().equals(item.getServeType())
                     && !groupIds.contains(item.getServeId())) {
-//                if (item.getGroup){
-//
-//                }
                 groupIds.add(item.getServeId());
             }
             if (item.getServeId() != null && RightsServeTypeEnum.NEWS.name().equals(item.getServeType())

pcloud-service-book/src/main/resources/mapper/skill/PcloudGroupActivityDao.xml

@@ -291,7 +291,7 @@
         LEFT JOIN pcloud_group_activity a ON a.book_group_classify_id = c.id
         LEFT JOIN book_group_qrcode b on b.classify_id = c.id
         where
-        c.is_delete = 0 and  b.is_delete = 0
+        b.is_delete = 0
         and
         c.id IN
         <foreach collection="list" item="item" open="(" close=")" separator=",">