From aa1d66c1f98b14a67030e80e64e6c842d7d0ebb7 Mon Sep 17 00:00:00 2001
From: jinyu <foxinmy@gmail.com>
Date: Tue, 1 Sep 2015 22:36:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0user=E4=B8=AD=E7=9A=84enable?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/foxinmy/weixin4j/qy/api/UserApi.java  | 14 ++++++----
 .../com/foxinmy/weixin4j/qy/model/User.java   | 28 ++++++-------------
 2 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/UserApi.java b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/UserApi.java
index 6eefda57..e96a0c7e 100644
--- a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/UserApi.java
+++ b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/UserApi.java
@@ -110,12 +110,16 @@ public class UserApi extends QyApi {
 	private JsonResult excute(String uri, User user, InputStream avatar)
 			throws WeixinException {
 		JSONObject obj = (JSONObject) JSON.toJSON(user);
-		Object extattr = obj.remove("extattr");
-		if (extattr != null) {
+		Object val = obj.remove("extattr");
+		if (val != null) {
 			JSONObject attrs = new JSONObject();
-			attrs.put("attrs", extattr);
+			attrs.put("attrs", val);
 			obj.put("extattr", attrs);
 		}
+		val = obj.remove("status");
+		if (val != null) {
+			obj.put("enable", val);
+		}
 		if (avatar != null) {
 			obj.put("avatar_mediaid", mediaApi.uploadMedia(0, avatar, null));
 		} else {
@@ -141,8 +145,8 @@ public class UserApi extends QyApi {
 	public User getUser(String userid) throws WeixinException {
 		String user_get_uri = getRequestUri("user_get_uri");
 		Token token = tokenHolder.getToken();
-		WeixinResponse response = weixinExecutor.get(String.format(user_get_uri,
-				token.getAccessToken(), userid));
+		WeixinResponse response = weixinExecutor.get(String.format(
+				user_get_uri, token.getAccessToken(), userid));
 		JSONObject obj = response.getAsJson();
 		Object attrs = obj.getJSONObject("extattr").remove("attrs");
 		if (attrs != null) {
diff --git a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/model/User.java b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/model/User.java
index 7108779c..55164c38 100644
--- a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/model/User.java
+++ b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/model/User.java
@@ -68,10 +68,6 @@ public class User implements Serializable {
 	 * 关注状态: 1=已关注，2=已冻结，4=未关注
 	 */
 	private Integer status;
-	/**
-	 * 启用/禁用成员。1表示启用成员，0表示禁用成员
-	 */
-	private Integer enable;
 	/**
 	 * 非必须 扩展属性。扩展属性需要在WEB管理端创建后才生效，否则忽略未知属性的赋值
 	 */
@@ -159,20 +155,16 @@ public class User implements Serializable {
 		return status;
 	}
 
-	public Integer getEnable() {
-		return enable;
+	@JSONField(serialize = false)
+	public Boolean getFormatEnable() {
+		if (status != null) {
+			return status.intValue() != 2;
+		}
+		return null;
 	}
 
 	public void setEnable(boolean enable) {
-		this.enable = enable ? 1 : 0;
-	}
-
-	@JSONField(serialize = false)
-	public boolean getFormatEnable() {
-		if (enable != null) {
-			return enable.intValue() == 1;
-		}
-		return false;
+		this.status = enable ? 1 : 0;
 	}
 
 	public List<NameValue> getExtattr() {
@@ -237,16 +229,12 @@ public class User implements Serializable {
 		this.status = status;
 	}
 
-	public void setEnable(Integer enable) {
-		this.enable = enable;
-	}
-
 	@Override
 	public String toString() {
 		return "User [userId=" + userId + ", name=" + name + ", partyIds="
 				+ partyIds + ", position=" + position + ", mobile=" + mobile
 				+ ", gender=" + gender + ", tel=" + tel + ", email=" + email
 				+ ", weixinId=" + weixinId + ", avatar=" + avatar + ", status="
-				+ status + ", enable=" + enable + ", extattr=" + extattr + "]";
+				+ status + ", extattr=" + extattr + "]";
 	}
 }