From 704a389ddb40d8a2eb9aa52d2230d8e29c030c77 Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Thu, 12 Mar 2020 17:41:31 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20#1432=20=E4=BC=81=E4=B8=9A=E5=BE=AE?= =?UTF-8?q?=E4=BF=A1=E9=83=A8=E9=97=A8=E7=B1=BB=E5=A2=9E=E5=8A=A0=E8=8B=B1?= =?UTF-8?q?=E6=96=87=E5=90=8D=E7=A7=B0=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/me/chanjar/weixin/cp/bean/WxCpDepart.java | 5 +++-- .../chanjar/weixin/cp/util/json/WxCpDepartGsonAdapter.java | 7 +++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpDepart.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpDepart.java index dc71e027e..f5b9b3259 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpDepart.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpDepart.java @@ -6,16 +6,17 @@ import lombok.Data; import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder; /** - * 微信部门. + * 企业微信的部门. * * @author Daniel Qian */ @Data public class WxCpDepart implements Serializable { - private static final long serialVersionUID = -5028321625140879571L; + private Long id; private String name; + private String enName; private Long parentId; private Long order; diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/json/WxCpDepartGsonAdapter.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/json/WxCpDepartGsonAdapter.java index a999d7b2e..4340855fd 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/json/WxCpDepartGsonAdapter.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/json/WxCpDepartGsonAdapter.java @@ -28,6 +28,7 @@ import me.chanjar.weixin.cp.bean.WxCpDepart; public class WxCpDepartGsonAdapter implements JsonSerializer, JsonDeserializer { private static final String ID = "id"; private static final String NAME = "name"; + private static final String EN_NAME = "name_en"; private static final String PARENT_ID = "parentid"; private static final String ORDER = "order"; @@ -40,6 +41,9 @@ public class WxCpDepartGsonAdapter implements JsonSerializer, JsonDe if (group.getName() != null) { json.addProperty(NAME, group.getName()); } + if (group.getEnName() != null) { + json.addProperty(EN_NAME, group.getEnName()); + } if (group.getParentId() != null) { json.addProperty(PARENT_ID, group.getParentId()); } @@ -60,6 +64,9 @@ public class WxCpDepartGsonAdapter implements JsonSerializer, JsonDe if (departJson.get(NAME) != null && !departJson.get(NAME).isJsonNull()) { depart.setName(GsonHelper.getAsString(departJson.get(NAME))); } + if (departJson.get(EN_NAME) != null && !departJson.get(EN_NAME).isJsonNull()) { + depart.setEnName(GsonHelper.getAsString(departJson.get(EN_NAME))); + } if (departJson.get(ORDER) != null && !departJson.get(ORDER).isJsonNull()) { depart.setOrder(GsonHelper.getAsLong(departJson.get(ORDER))); }