Merge branch 'master-xgh-好办停用' into 'developer'

修复查询外部联系人

See merge request !250

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

@@ -358,7 +358,8 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
                 List<String> externalUserIdList = new ArrayList<>();
                 externalUserIdList.addAll(externalUserIdSet);
                 List<MemberUnionidRelated> unionidlist = this.memberUnionidRelatedMapper.listByWxEnterpriseIdAndExternalUserId(wxEnterpriseId, externalUserIdList);
-                Map<String, String> map = unionidlist.stream().collect(Collectors.toMap(MemberUnionidRelated::getExternalUserid, MemberUnionidRelated::getSelfExternalUserid, (k1, k2) -> k1));
+                Map<String, String> map = unionidlist.stream().filter(dto->StringUtils.isNotBlank(dto.getExternalUserid()) && StringUtils.isNotBlank(dto.getSelfExternalUserid()))
+                        .collect(Collectors.toMap(MemberUnionidRelated::getExternalUserid, MemberUnionidRelated::getSelfExternalUserid, (k1, k2) -> k1));
                 logger.info("外部联系人检查,第{}次,好友数={},unionid表数={}", pageNum, externalUserIdList.size(), unionidlist.size());
                 List<String> delList = new ArrayList<>();
                 Set<String> checkSet = unionidlist.stream().map(dto -> dto.getExternalUserid()).collect(Collectors.toSet());