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,9 +214,9 @@ public class GroupChatHmServiceImpl implements GroupChatHmService {
                     this.saveChatFullNotice(wxEnterpriseId, thisGroupChatId);
                     return;
                 }
-                if (CollectionUtils.isNotEmpty(qwChatIdList)) {
                 // 处理要踢的
-                    for (String wxChatId : qwChatIdList) {
+                List<String> bakQwChatIdList = EntityUtil.changeEntityListByJSON(String.class, qwChatIdList);
+                for (String wxChatId : bakQwChatIdList) {
                     TabGroupChat chat = this.groupChatMapper.selectByWxChatIdDk(wxEnterpriseId, wxChatId);
                     if (null == chat) {
                         continue;
@@ -240,8 +240,12 @@ public class GroupChatHmServiceImpl implements GroupChatHmService {
                         while(it.hasNext()) {
                             if(it.next().equals(cid.getWxChatIdDk())) {
                                 it.remove(); 
+                                break ;
+                            }
+                        }
                     }
                 }
+                logger.info("处理后群活码应有的群={}", qwChatIdList);
                 // 保存活码
                 List<TabGroupChat> list = this.groupChatMapper.listByWxWxChatIdListDk(wxEnterpriseId,
                         qwChatIdList);
@@ -258,9 +262,6 @@ public class GroupChatHmServiceImpl implements GroupChatHmService {
              }
         }
     }
-            }
-        }
-    }
 
     @Override
     public ServiceResponse<GroupChatHmDTO> saveHm(GroupChatHmDTO dto) {