Merge branch 'fixbug/10242001' into 'master'

bug :[10242001] 修改分类权益获取群sql

See merge request rays/pcloud-book!781

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

@@ -188,9 +188,11 @@
         a.subject_label_id AS subjectLabelId
         FROM
         book_group_classify c
-        LEFT JOIN pcloud_group_activity a ON a.book_group_classify_id = c.id
+        LEFT JOIN pcloud_group_activity a ON a.book_group_classify_id = c.id AND c.is_delete = 0
         LEFT JOIN book_group_qrcode b on b.classify_id = c.id AND b.is_delete = 0
-        where  c.id IN
+        where
+        a.is_delete = 0
+        and c.id IN
         <foreach collection="list" item="item" open="(" close=")" separator=",">
             ${item}
         </foreach>