From bdd72995a5ae84c9bb51916dbb133d074772027e Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Thu, 24 Jan 2019 11:47:01 +0800 Subject: [PATCH] =?UTF-8?q?#927=20=E4=BC=81=E4=B8=9A=E5=BE=AE=E4=BF=A1WxCp?= =?UTF-8?q?User=E7=9A=84departIds=E7=B1=BB=E5=9E=8B=E6=94=B9=E4=B8=BALong[?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/me/chanjar/weixin/cp/bean/WxCpUser.java | 2 +- .../me/chanjar/weixin/cp/util/json/WxCpUserGsonAdapter.java | 6 +++--- .../chanjar/weixin/cp/api/impl/WxCpUserServiceImplTest.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) 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 5a4f998d..dcf4789e 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 @@ -20,7 +20,7 @@ public class WxCpUser implements Serializable { private static final long serialVersionUID = -5696099236344075582L; private String userId; private String name; - private Integer[] departIds; + private Long[] departIds; private Integer[] orders; private String position; private String mobile; 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 7f8b2640..84ee7c0f 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 @@ -41,10 +41,10 @@ public class WxCpUserGsonAdapter implements JsonDeserializer, JsonSeri if (o.get("department") != null) { JsonArray departJsonArray = o.get("department").getAsJsonArray(); - Integer[] departIds = new Integer[departJsonArray.size()]; + Long[] departIds = new Long[departJsonArray.size()]; int i = 0; for (JsonElement jsonElement : departJsonArray) { - departIds[i++] = jsonElement.getAsInt(); + departIds[i++] = jsonElement.getAsLong(); } user.setDepartIds(departIds); } @@ -156,7 +156,7 @@ public class WxCpUserGsonAdapter implements JsonDeserializer, JsonSeri } if (user.getDepartIds() != null) { JsonArray jsonArray = new JsonArray(); - for (Integer departId : user.getDepartIds()) { + for (Long departId : user.getDepartIds()) { jsonArray.add(new JsonPrimitive(departId)); } o.add("department", jsonArray); diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/WxCpUserServiceImplTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/WxCpUserServiceImplTest.java index f473fe6b..2ec33e7b 100644 --- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/WxCpUserServiceImplTest.java +++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/WxCpUserServiceImplTest.java @@ -42,7 +42,7 @@ public class WxCpUserServiceImplTest { WxCpUser user = new WxCpUser(); user.setUserId(userId); user.setName("Some Woman"); - user.setDepartIds(new Integer[]{2}); + user.setDepartIds(new Long[]{2L}); user.setEmail("none@none.com"); user.setGender(Gender.FEMALE); user.setMobile("13560084979");