Merge branch 'feature/xgh/202506迭代' into 'developer'

Feature/xgh/202506迭代

See merge request !3036

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/HmLinkServiceImpl.java

 package com.gic.haoban.manage.service.service.hm.impl;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -160,6 +161,9 @@ public class HmLinkServiceImpl implements HmLinkService {
         // 群活码
         if (dto.getLinkType() == HmLinkTypeEnum.CHAT_HM_LINK_TYPE.getLinkType()) {
             int index = 0;
+            if(CollectionUtils.isEmpty(dto.getLinkChatList())) {
+                dto.setLinkChatList(new ArrayList<>());
+            }
             for (HmLinkChatDTO item : dto.getLinkChatList()) {
                 item.setWxEnterpriseId(dto.getWxEnterpriseId());
                 item.setEnterpriseId(dto.getEnterpriseId());

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/QywxTagApiServiceImpl.java

@@ -705,7 +705,7 @@ public class QywxTagApiServiceImpl implements QywxTagApiService {
             Set<String> noSyncTagItemIds = new HashSet<>();
             if (!CollectionUtils.isEmpty(gicItems)) {
                 noSyncTagItemIds = gicItems.stream().filter(item -> !entQywxSyncTagItemIds.contains(item.getTagsId())).map(dto -> dto.getTagsId()).collect(Collectors.toSet());
-                logger.info("没有同步的标签：{}", JSONObject.toJSONString(noSyncTagItemIds));
+                logger.info("与企微不同步的标签：{}", JSONObject.toJSONString(noSyncTagItemIds));
             }
             //该企业下会员需要设置的标签
             Sets.SetView<String> entMemberNeedSetQywxKeys = Sets.intersection(staffHasSetTagKeys, entQywxSyncTagKeys);