Merge branch 'fixbug/10024256' into 'master'

bug: [10024256] 上下五千年这本书匹配的群展示空白

See merge request rays/pcloud-book!797

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

@@ -60,6 +60,7 @@ import com.pcloud.usercenter.party.agent.service.AgentService;
 import com.sdk.wxgroup.RobotProcessTypeEnum;
 import com.sdk.wxgroup.SendGroupInviteVO;
 import com.sdk.wxgroup.SendPicMessageVO;
+import java.util.Iterator;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -438,14 +439,29 @@ public class PcloudGroupActivityBizImpl implements PcloudGroupActivityBiz {
         if (ListUtils.isEmpty(ids)) {
             return new HashMap<>();
         }
-        List<Long> activityGroupIds = new ArrayList<>();
         List<Long> adviserGroupIds = rightsSettingItemDetailDao.getAdviserGroupIds(ids);
+        List<Long> adviserGroupIds4Save = Lists.newArrayList(adviserGroupIds);
+        List<Long> activityGroupIds = getActivityGroupIds(ids,adviserGroupIds);
+        // 合并
+        return getGroupMap(adviserGroupIds4Save, activityGroupIds);
+    }
+
+    private List<Long> getActivityGroupIds(List<Long> ids, List<Long> adviserGroupIds) {
         if (!ListUtils.isEmpty(adviserGroupIds)) {
-            ids.removeAll(adviserGroupIds);
+            Iterator<Long> it4Ids = ids.iterator();
+            while (it4Ids.hasNext()) {
+                Long serverId = it4Ids.next();
+                Iterator<Long> it4Group = adviserGroupIds.iterator();
+                while (it4Group.hasNext()) {
+                    Long serverId4Group = it4Group.next();
+                    if (serverId.equals(serverId4Group)) {
+                        it4Group.remove();
+                        it4Ids.remove();
+                    }
                 }
-        activityGroupIds = ids;
-        // 合并
-        return getGroupMap(adviserGroupIds, activityGroupIds);
+            }
+        }
+        return ids;
     }
 
     private Map<Long, GroupActivity4AppletDTO> getGroupMap(List<Long> adviserGroupIds, List<Long> activityGroupIds) {
@@ -569,16 +585,13 @@ public class PcloudGroupActivityBizImpl implements PcloudGroupActivityBiz {
 
     @Override
     public Map<Long, GroupActivity4AppletDTO> getByIds4Now(List<Long> ids) {
-        if(ListUtils.isEmpty(ids)){
+        if (ListUtils.isEmpty(ids)) {
             return new HashMap<>();
         }
         List<Long> adviserGroupIds = rightsNowItemDao.getAdviserGroupIds(ids);
-        List<Long> activityGroupIds = new ArrayList<>();
-        if (!ListUtils.isEmpty(adviserGroupIds)) {
-            ids.removeAll(adviserGroupIds);
-        }
-        activityGroupIds = ids;
-        return getGroupMap(adviserGroupIds, activityGroupIds);
+        List<Long> adviserGroupIds4Save = Lists.newArrayList(adviserGroupIds);
+        List<Long> activityGroupIds = getActivityGroupIds(ids,adviserGroupIds);
+        return getGroupMap(adviserGroupIds4Save, activityGroupIds);
     }
 
     @Override

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

@@ -168,7 +168,7 @@
 
     <select id="getAdviserGroupIds" parameterType="list" resultType="long">
         select
-        serve_id
+        DISTINCT(serve_id)
         from
         rights_now_item
         where