Merge branch 'feature/自建应用验证' into 'master'

Feature/自建应用验证

See merge request !1245

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/impl/GroupChatHmServiceImpl.java

@@ -214,51 +214,52 @@ public class GroupChatHmServiceImpl implements GroupChatHmService {
                     this.saveChatFullNotice(wxEnterpriseId, thisGroupChatId);
                     return;
                 }
-                if (CollectionUtils.isNotEmpty(qwChatIdList)) {
-                    // 处理要踢的
-                    for (String wxChatId : qwChatIdList) {
-                        TabGroupChat chat = this.groupChatMapper.selectByWxChatIdDk(wxEnterpriseId, wxChatId);
-                        if (null == chat) {
-                            continue;
-                        }
-                        TabGroupChat cid = null;
-                        String staffId = chat.getStaffId();
-                        for (TabGroupChat obj : chatList) {
-                            if (obj.getStaffId().equals(staffId)) {
-                                if (null == cid) {
+                // 处理要踢的
+                List<String> bakQwChatIdList = EntityUtil.changeEntityListByJSON(String.class, qwChatIdList);
+                for (String wxChatId : bakQwChatIdList) {
+                    TabGroupChat chat = this.groupChatMapper.selectByWxChatIdDk(wxEnterpriseId, wxChatId);
+                    if (null == chat) {
+                        continue;
+                    }
+                    TabGroupChat cid = null;
+                    String staffId = chat.getStaffId();
+                    for (TabGroupChat obj : chatList) {
+                        if (obj.getStaffId().equals(staffId)) {
+                            if (null == cid) {
+                                cid = obj;
+                            } else {
+                                if (obj.getTotalCount() > cid.getTotalCount()) {
                                     cid = obj;
-                                } else {
-                                    if (obj.getTotalCount() > cid.getTotalCount()) {
-                                        cid = obj;
-                                    }
                                 }
                             }
                         }
-                        if (null != cid) {
-                            logger.info("hm={},群={},要删={}", wxChatId, qwChatIdList, cid.getWxChatId());
-                            Iterator<String> it = qwChatIdList.iterator() ;
-                            while(it.hasNext()) {
-                                if(it.next().equals(cid.getWxChatIdDk())) {
-                                    it.remove(); 
-                                }
-                            }
-                            // 保存活码
-                            List<TabGroupChat> list = this.groupChatMapper.listByWxWxChatIdListDk(wxEnterpriseId,
-                                    qwChatIdList);
-                            if (CollectionUtils.isEmpty(list) || list.size() != qwChatIdList.size()) {
-                                this.saveChatFullNotice(wxEnterpriseId, thisGroupChatId);
-                                logger.info("查询群列表空,或数量不一致,dkList={}", qwChatIdList);
-                                return;
+                    }
+                    if (null != cid) {
+                        logger.info("hm={},群={},要删={}", wxChatId, qwChatIdList, cid.getWxChatId());
+                        Iterator<String> it = qwChatIdList.iterator() ;
+                        while(it.hasNext()) {
+                            if(it.next().equals(cid.getWxChatIdDk())) {
+                                it.remove(); 
+                                break ;
                             }
-                            List<Long> groupChatIdList = list.stream().map(dto -> dto.getGroupChatId())
-                                    .collect(Collectors.toList());
-                            GroupChatHmDTO hmDTO = EntityUtil.changeEntityByJSON(GroupChatHmDTO.class, hm);
-                            hmDTO.setChatIdList(groupChatIdList);
-                            this.saveHm(hmDTO, 2);
                         }
                     }
                 }
-            }
+                logger.info("处理后群活码应有的群={}", qwChatIdList);
+                // 保存活码
+                List<TabGroupChat> list = this.groupChatMapper.listByWxWxChatIdListDk(wxEnterpriseId,
+                        qwChatIdList);
+                if (CollectionUtils.isEmpty(list) || list.size() != qwChatIdList.size()) {
+                    this.saveChatFullNotice(wxEnterpriseId, thisGroupChatId);
+                    logger.info("查询群列表空,或数量不一致,dkList={}", qwChatIdList);
+                    return;
+                }
+                List<Long> groupChatIdList = list.stream().map(dto -> dto.getGroupChatId())
+                        .collect(Collectors.toList());
+                GroupChatHmDTO hmDTO = EntityUtil.changeEntityByJSON(GroupChatHmDTO.class, hm);
+                hmDTO.setChatIdList(groupChatIdList);
+                this.saveHm(hmDTO, 2);
+             }
         }
     }