binarywang#927 企业微信WxCpUser的departIds类型改为Long[]

binarywang · binarywang · commit bdd72995a5ae · 2019-01-24T11:47:01.000+08:00
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
@@ -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
@@ -41,10 +41,10 @@ public WxCpUser deserialize(JsonElement json, Type typeOfT, JsonDeserializationC
 
     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 JsonElement serialize(WxCpUser user, Type typeOfSrc, JsonSerializationCon
     }
     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
@@ -42,7 +42,7 @@ public void testCreate() throws Exception {
     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");

Original file line number	Diff line number	Diff line change
`@@ -41,10 +41,10 @@ public WxCpUser deserialize(JsonElement json, Type typeOfT, JsonDeserializationC`
`41`	`41`
`42`	`42`	`if (o.get("department") != null) {`
`43`	`43`	`JsonArray departJsonArray = o.get("department").getAsJsonArray();`
`44`		`- Integer[] departIds = new Integer[departJsonArray.size()];`
	`44`	`+ Long[] departIds = new Long[departJsonArray.size()];`
`45`	`45`	`int i = 0;`
`46`	`46`	`for (JsonElement jsonElement : departJsonArray) {`
`47`		`- departIds[i++] = jsonElement.getAsInt();`
	`47`	`+ departIds[i++] = jsonElement.getAsLong();`
`48`	`48`	`}`
`49`	`49`	`user.setDepartIds(departIds);`
`50`	`50`	`}`
`@@ -156,7 +156,7 @@ public JsonElement serialize(WxCpUser user, Type typeOfSrc, JsonSerializationCon`
`156`	`156`	`}`
`157`	`157`	`if (user.getDepartIds() != null) {`
`158`	`158`	`JsonArray jsonArray = new JsonArray();`
`159`		`- for (Integer departId : user.getDepartIds()) {`
	`159`	`+ for (Long departId : user.getDepartIds()) {`
`160`	`160`	`jsonArray.add(new JsonPrimitive(departId));`
`161`	`161`	`}`
`162`	`162`	`o.add("department", jsonArray);`