From 568d02c25ee22f80cc8021d29df7fe784602881d Mon Sep 17 00:00:00 2001
From: wrinkle <imowen@163.com>
Date: Fri, 2 Jul 2021 09:52:38 +0800
Subject: [PATCH] =?UTF-8?q?:new:=20#2181=E3=80=90=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E3=80=91=E5=A2=9E=E5=8A=A0=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E4=BC=A0=E5=85=A5groupId=E5=8F=82=E6=95=B0=E7=9A=84=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E4=BC=81=E4=B8=9A=E6=A0=87=E7=AD=BE=E5=BA=93=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weixin/cp/api/WxCpExternalContactService.java  | 14 ++++++++++++++
 .../api/impl/WxCpExternalContactServiceImpl.java   | 14 ++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpExternalContactService.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpExternalContactService.java
index cd65ad377..cd37f9a94 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpExternalContactService.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpExternalContactService.java
@@ -455,6 +455,20 @@ public interface WxCpExternalContactService {
    */
   WxCpUserExternalTagGroupList getCorpTagList(String[] tagId) throws WxErrorException;
 
+  /**
+   * <pre>
+   * 企业可通过此接口获取企业客户标签详情。
+   * 若tag_id和group_id均为空，则返回所有标签。
+   * 同时传递tag_id和group_id时，忽略tag_id，仅以group_id作为过滤条件。
+   * </pre>
+   *
+   * @param tagId the tag id
+   * @param groupId the tagGroup id
+   * @return corp tag list
+   * @throws WxErrorException the wx error exception
+   */
+  WxCpUserExternalTagGroupList getCorpTagList(String[] tagId, String[] groupId) throws WxErrorException;
+
   /**
    * <pre>
    * 企业可通过此接口向客户标签库中添加新的标签组和标签，每个企业最多可配置3000个企业标签。
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpExternalContactServiceImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpExternalContactServiceImpl.java
index 8065d2198..c14a7c5c1 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpExternalContactServiceImpl.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpExternalContactServiceImpl.java
@@ -334,6 +334,20 @@ public class WxCpExternalContactServiceImpl implements WxCpExternalContactServic
     return WxCpUserExternalTagGroupList.fromJson(result);
   }
 
+  @Override
+  public WxCpUserExternalTagGroupList getCorpTagList(String[] tagId, String[] groupId) throws WxErrorException {
+    JsonObject json = new JsonObject();
+    if (ArrayUtils.isNotEmpty(tagId)) {
+      json.add("tag_id", new Gson().toJsonTree(tagId).getAsJsonArray());
+    }
+    if (ArrayUtils.isNotEmpty(groupId)) {
+      json.add("group_id", new Gson().toJsonTree(groupId).getAsJsonArray());
+    }
+    final String url = this.mainService.getWxCpConfigStorage().getApiUrl(GET_CORP_TAG_LIST);
+    final String result = this.mainService.post(url, json.toString());
+    return WxCpUserExternalTagGroupList.fromJson(result);
+  }
+
   @Override
   public WxCpUserExternalTagGroupInfo addCorpTag(WxCpUserExternalTagGroupInfo tagGroup) throws WxErrorException {