#927 企业微信WxCpUser的departIds类型改为Long[]
This commit is contained in:
@@ -20,7 +20,7 @@ public class WxCpUser implements Serializable {
|
|||||||
private static final long serialVersionUID = -5696099236344075582L;
|
private static final long serialVersionUID = -5696099236344075582L;
|
||||||
private String userId;
|
private String userId;
|
||||||
private String name;
|
private String name;
|
||||||
private Integer[] departIds;
|
private Long[] departIds;
|
||||||
private Integer[] orders;
|
private Integer[] orders;
|
||||||
private String position;
|
private String position;
|
||||||
private String mobile;
|
private String mobile;
|
||||||
|
|||||||
@@ -41,10 +41,10 @@ public class WxCpUserGsonAdapter implements JsonDeserializer<WxCpUser>, JsonSeri
|
|||||||
|
|
||||||
if (o.get("department") != null) {
|
if (o.get("department") != null) {
|
||||||
JsonArray departJsonArray = o.get("department").getAsJsonArray();
|
JsonArray departJsonArray = o.get("department").getAsJsonArray();
|
||||||
Integer[] departIds = new Integer[departJsonArray.size()];
|
Long[] departIds = new Long[departJsonArray.size()];
|
||||||
int i = 0;
|
int i = 0;
|
||||||
for (JsonElement jsonElement : departJsonArray) {
|
for (JsonElement jsonElement : departJsonArray) {
|
||||||
departIds[i++] = jsonElement.getAsInt();
|
departIds[i++] = jsonElement.getAsLong();
|
||||||
}
|
}
|
||||||
user.setDepartIds(departIds);
|
user.setDepartIds(departIds);
|
||||||
}
|
}
|
||||||
@@ -156,7 +156,7 @@ public class WxCpUserGsonAdapter implements JsonDeserializer<WxCpUser>, JsonSeri
|
|||||||
}
|
}
|
||||||
if (user.getDepartIds() != null) {
|
if (user.getDepartIds() != null) {
|
||||||
JsonArray jsonArray = new JsonArray();
|
JsonArray jsonArray = new JsonArray();
|
||||||
for (Integer departId : user.getDepartIds()) {
|
for (Long departId : user.getDepartIds()) {
|
||||||
jsonArray.add(new JsonPrimitive(departId));
|
jsonArray.add(new JsonPrimitive(departId));
|
||||||
}
|
}
|
||||||
o.add("department", jsonArray);
|
o.add("department", jsonArray);
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ public class WxCpUserServiceImplTest {
|
|||||||
WxCpUser user = new WxCpUser();
|
WxCpUser user = new WxCpUser();
|
||||||
user.setUserId(userId);
|
user.setUserId(userId);
|
||||||
user.setName("Some Woman");
|
user.setName("Some Woman");
|
||||||
user.setDepartIds(new Integer[]{2});
|
user.setDepartIds(new Long[]{2L});
|
||||||
user.setEmail("none@none.com");
|
user.setEmail("none@none.com");
|
||||||
user.setGender(Gender.FEMALE);
|
user.setGender(Gender.FEMALE);
|
||||||
user.setMobile("13560084979");
|
user.setMobile("13560084979");
|
||||||
|
|||||||
Reference in New Issue
Block a user