Merge branch 'fixbug/1024236' into 'master'

bug: [1024236] 书刊权益添加编辑社群点击下一步刷新之后空白

See merge request rays/pcloud-book!782

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

@@ -172,32 +172,31 @@
 
     <!-- 立享权益加入 编辑端群 add by pansy  2020/7/2 -->
     <select id="getGroupClassifyByIds" resultType="com.pcloud.book.skill.dto.GroupActivity4AppletDTO">
-        SELECT
-        c.id,
-        a.id groupActivityId,
-        a.`name`,
-        c.classify_introduce AS `desc`,
-        a.join_type AS joinType,
-        c.classify AS groupName,
-        b.user_number userNumber,
-        b.classify_id classifyId,
-        c.book_group_id bookGroupId,
-        a.first_classify AS firstClassify,
-        a.second_classify AS secondClassify,
-        a.grade_label_id AS gradeLabelId,
-        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 AND c.is_delete = 0
-        LEFT JOIN book_group_qrcode b on b.classify_id = c.id AND b.is_delete = 0
-        where
-        a.is_delete = 0
-        and c.id IN
-        <foreach collection="list" item="item" open="(" close=")" separator=",">
-            ${item}
-        </foreach>
-        GROUP BY a.id
-        ORDER BY a.id DESC
+      SELECT
+      c.id,
+      a.id groupActivityId,
+      a.`name`,
+      c.classify_introduce AS `desc`,
+      a.join_type AS joinType,
+      c.classify AS groupName,
+      b.user_number userNumber,
+      b.classify_id classifyId,
+      c.book_group_id bookGroupId,
+      a.first_classify AS firstClassify,
+      a.second_classify AS secondClassify,
+      a.grade_label_id AS gradeLabelId,
+      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 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
+      <foreach collection="list" item="item" open="(" close=")" separator=",">
+        ${item}
+      </foreach>
+      GROUP BY c.id
+      ORDER BY c.id DESC
     </select>
 
   <select id="getByIds" resultType="com.pcloud.book.skill.dto.GroupActivity4AppletDTO">