From edf1401dbee5e6c25afef780745b1afcd5a69939 Mon Sep 17 00:00:00 2001
From: wzw921001 <756568809@qq.com>
Date: Tue, 26 May 2020 17:41:47 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20#1583=20=E4=BC=81=E4=B8=9A=E5=BE=AE?=
 =?UTF-8?q?=E4=BF=A1=E8=AF=BB=E5=8F=96=E6=88=90=E5=91=98=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=9B=9E=E5=AD=97=E6=AE=B5=EF=BC=9A?=
 =?UTF-8?q?main=5Fdepartment?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: laowang <wangzhengwei@chinaredstar.cn>
---
 .../src/main/java/me/chanjar/weixin/cp/bean/WxCpUser.java     | 1 +
 .../me/chanjar/weixin/cp/util/json/WxCpUserGsonAdapter.java   | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUser.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUser.java
index 07ecb4aa8..c44400a73 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUser.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUser.java
@@ -31,6 +31,7 @@ public class WxCpUser implements Serializable {
   private String email;
   private String avatar;
   private String thumbAvatar;
+  private String mainDepartment;
 
   /**
    * 地址。长度最大128个字符
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/json/WxCpUserGsonAdapter.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/json/WxCpUserGsonAdapter.java
index e8bfd14b2..4ce0afda1 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/json/WxCpUserGsonAdapter.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/json/WxCpUserGsonAdapter.java
@@ -74,6 +74,7 @@ public class WxCpUserGsonAdapter implements JsonDeserializer<WxCpUser>, JsonSeri
     user.setTelephone(GsonHelper.getString(o, "telephone"));
     user.setQrCode(GsonHelper.getString(o, "qr_code"));
     user.setToInvite(GsonHelper.getBoolean(o, "to_invite"));
+    user.setMainDepartment(GsonHelper.getString(o, "main_department"));
 
     if (GsonHelper.isNotNull(o.get(EXTRA_ATTR))) {
       this.buildExtraAttrs(o, user);
@@ -243,6 +244,9 @@ public class WxCpUserGsonAdapter implements JsonDeserializer<WxCpUser>, JsonSeri
     if (user.getToInvite() != null) {
       o.addProperty("to_invite", user.getToInvite());
     }
+    if (user.getMainDepartment() != null) {
+      o.addProperty("main_department", user.getMainDepartment());
+    }
 
     if (user.getExtAttrs().size() > 0) {
       JsonArray attrsJsonArray = new JsonArray();