Merge branch 'fixbug/1024262' into 'master'

bug: [1024262] 【生产环境】【平台端】【权益配置】选择某些群时保存多次，群会出现空白情况

See merge request rays/pcloud-book!800

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

@@ -1204,8 +1204,10 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
                     if (groupActivity4AppletDTO != null) {
                         item.setGroupName(groupActivity4AppletDTO.getName());
                         item.setGroupDesc(groupActivity4AppletDTO.getCutDesc());
-                        item.setGroupType(groupActivity4AppletDTO.getGroupType() == null ? null :groupActivity4AppletDTO.getGroupType().toString());
-                        item.setLinkUrl(groupActivity4AppletDTO.getGroupLink());
+                        if (StringUtil.isEmpty(item.getGroupType())){ //add by pans 编辑段群groupType来源于rightNowItem
+                            item.setGroupType(groupActivity4AppletDTO.getGroupType() == null ? null :groupActivity4AppletDTO.getGroupType().toString());
+                            item.setLinkUrl(groupActivity4AppletDTO.getGroupLink());
+                        }
                         // 填充头像
                         fillGroupActivityHead(Collections.singletonList(groupActivity4AppletDTO));
                         item.setGroupQrCode(groupActivity4AppletDTO.getGroupPic());

pcloud-service-book/src/main/java/com/pcloud/book/skill/biz/impl/PcloudGroupActivityBizImpl.java

@@ -449,6 +449,7 @@ public class PcloudGroupActivityBizImpl implements PcloudGroupActivityBiz {
     private List<Long> getActivityGroupIds(List<Long> ids, List<Long> adviserGroupIds) {
         if (!ListUtils.isEmpty(adviserGroupIds)) {
             Iterator<Long> it4Ids = ids.iterator();
+            log.info("it4Ids : {}, adviserGroupIds {}",ids,adviserGroupIds);
             while (it4Ids.hasNext()) {
                 Long serverId = it4Ids.next();
                 Iterator<Long> it4Group = adviserGroupIds.iterator();
@@ -456,7 +457,9 @@ public class PcloudGroupActivityBizImpl implements PcloudGroupActivityBiz {
                     Long serverId4Group = it4Group.next();
                     if (serverId.equals(serverId4Group)) {
                         it4Group.remove();
-                        it4Ids.remove();
+                        if(!ListUtils.isEmpty(ids)){
+                            it4Ids.remove();
+                        }
                     }
                 }
             }

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

@@ -13,11 +13,12 @@
         <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
         <result property="rightsItemGroupId" column="rights_item_group_id" jdbcType="BIGINT"/>
         <result property="rightsSettingTitleId" column="rights_setting_title_id" jdbcType="BIGINT"/>
+        <result property="groupType" column="group_type" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
         id, rights_setting_id, serve_id, serve_type, link_url, type, gift_coupon_package_id, create_time,
-        rights_item_group_id,rights_setting_title_id
+        rights_item_group_id,rights_setting_title_id,group_type
     </sql>
 
     <select id="getById" resultMap="BaseResultMap" parameterType="java.lang.Long">

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

@@ -50,6 +50,7 @@
         select count(1)
         from pcloud_group_activity
         where number=#{number}
+        and is_delete = 0
     </select>