feat：企微同步标签修改

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

@@ -200,7 +200,6 @@ public class QywxTagApiServiceImpl implements QywxTagApiService {
             QywxTagDTO qywxTagDTO = new QywxTagDTO();
             qywxTagDTO.setName(item.getQywxTagName());
             qywxTagDTO.setOrder(item.getOrder());
-            qywxTagDTO.setId(item.getQywxTagKey());
             return qywxTagDTO;
         }).collect(Collectors.toList());
         qywxTagGroupDTO.setTag(tagItems);
@@ -872,7 +871,7 @@ public class QywxTagApiServiceImpl implements QywxTagApiService {
             ret.put("描述", "企业微信标签项空:" + tabQywxTag.getQywxGroupName());
             return ret;
         }
-        Map<String, QywxTagDTO> qywxTagDTOMap = tagItems.stream().filter(dto -> dto.isDeleted() == false).collect(Collectors.toMap(dto -> dto.getId(), dto -> dto));
+        Map<String, QywxTagDTO> qywxTagDTOMap = tagItems.stream().collect(Collectors.toMap(dto -> dto.getId(), dto -> dto));
         Set<String> qywxKeysSet = qywxTagDTOMap.keySet();
 
         //gic没有同步的标签项
@@ -885,7 +884,7 @@ public class QywxTagApiServiceImpl implements QywxTagApiService {
         //企业微信存在 gic不存在
         Sets.SetView<String> gicUnHaves = Sets.difference(qywxKeysSet, gicQywxKeysSet);
 
-        ret.put("现企微标签项", tagItems.stream().filter(dto -> dto.isDeleted() == false).map(dto -> dto.getName()).collect(Collectors.joining("],[", "[", "]")));
+        ret.put("现企微标签项", tagItems.stream().map(dto -> dto.getName()).collect(Collectors.joining("],[", "[", "]")));
         ret.put("现gic标签项", gicTagItems.stream().map(dto -> dto.getTagItemName()).collect(Collectors.joining("],[", "[", "]")));
 
         //企业微信缺少