@@ -24,8 +24,6 @@ public WxCpUser deserialize(JsonElement json, Type typeOfT, JsonDeserializationC
2424 throws JsonParseException {
2525 JsonObject o = json .getAsJsonObject ();
2626 WxCpUser user = new WxCpUser ();
27- user .setUserId (GsonHelper .getString (o , "userid" ));
28- user .setName (GsonHelper .getString (o , "name" ));
2927
3028 if (o .get ("department" ) != null ) {
3129 JsonArray departJsonArray = o .get ("department" ).getAsJsonArray ();
@@ -37,14 +35,19 @@ public WxCpUser deserialize(JsonElement json, Type typeOfT, JsonDeserializationC
3735 user .setDepartIds (departIds );
3836 }
3937
38+ user .setUserId (GsonHelper .getString (o , "userid" ));
39+ user .setName (GsonHelper .getString (o , "name" ));
4040 user .setPosition (GsonHelper .getString (o , "position" ));
4141 user .setMobile (GsonHelper .getString (o , "mobile" ));
4242 user .setGender (GsonHelper .getString (o , "gender" ));
43- user .setTel (GsonHelper .getString (o , "tel" ));
4443 user .setEmail (GsonHelper .getString (o , "email" ));
45- user .setWeiXinId (GsonHelper .getString (o , "weixinid" ));
4644 user .setAvatar (GsonHelper .getString (o , "avatar" ));
4745 user .setStatus (GsonHelper .getInteger (o , "status" ));
46+ user .setEnable (GsonHelper .getInteger (o , "enable" ));
47+ user .setIsLeader (GsonHelper .getInteger (o , "isleader" ));
48+ user .setHideMobile (GsonHelper .getInteger (o , "hide_mobile" ));
49+ user .setEnglishName (GsonHelper .getString (o , "english_name" ));
50+ user .setTelephone (GsonHelper .getString (o , "telephone" ));
4851
4952 if (GsonHelper .isNotNull (o .get ("extattr" ))) {
5053 JsonArray attrJsonElements = o .get ("extattr" ).getAsJsonObject ().get ("attrs" ).getAsJsonArray ();
@@ -84,15 +87,9 @@ public JsonElement serialize(WxCpUser user, Type typeOfSrc, JsonSerializationCon
8487 if (user .getGender () != null ) {
8588 o .addProperty ("gender" , user .getGender ());
8689 }
87- if (user .getTel () != null ) {
88- o .addProperty ("tel" , user .getTel ());
89- }
9090 if (user .getEmail () != null ) {
9191 o .addProperty ("email" , user .getEmail ());
9292 }
93- if (user .getWeiXinId () != null ) {
94- o .addProperty ("weixinid" , user .getWeiXinId ());
95- }
9693 if (user .getAvatar () != null ) {
9794 o .addProperty ("avatar" , user .getAvatar ());
9895 }
@@ -102,6 +99,18 @@ public JsonElement serialize(WxCpUser user, Type typeOfSrc, JsonSerializationCon
10299 if (user .getEnable () != null ) {
103100 o .addProperty ("enable" , user .getEnable ());
104101 }
102+ if (user .getIsLeader () != null ) {
103+ o .addProperty ("isleader" , user .getIsLeader ());
104+ }
105+ if (user .getHideMobile () != null ) {
106+ o .addProperty ("hide_mobile" , user .getHideMobile ());
107+ }
108+ if (user .getEnglishName () != null ) {
109+ o .addProperty ("english_name" , user .getEnglishName ());
110+ }
111+ if (user .getTelephone () != null ) {
112+ o .addProperty ("telephone" , user .getTelephone ());
113+ }
105114 if (user .getExtAttrs ().size () > 0 ) {
106115 JsonArray attrsJsonArray = new JsonArray ();
107116 for (WxCpUser .Attr attr : user .getExtAttrs ()) {
0 commit comments