Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServerInterfaceImpl.java
===================================================================
diff -u -r35413 -r35439
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServerInterfaceImpl.java	(.../ServerInterfaceImpl.java)	(revision 35413)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServerInterfaceImpl.java	(.../ServerInterfaceImpl.java)	(revision 35439)
@@ -149,9 +149,13 @@
 				boolean enableUserAccountDeactivationFunction =
 						ConfigUtils.getSystemSetConfigByNameBool("enableUserAccountDeactivationFunction", false);
 				if(enableUserAccountDeactivationFunction){
-					User user = userManager.get(loginInfo.getLoginUserData().getUserId());
-					if(user != null && !user.isEnabled()){
-						throw new SystemException("当前用户已被停用。");
+					String action = getAction(jsonParams);
+					if(!StringUtils.equals("getInfoByBarcode_Login", action)
+							&& !StringUtils.equals("login", action)){
+						User user = userManager.get(loginInfo.getLoginUserData().getUserId());
+						if(user != null && !user.isEnabled()){
+							throw new SystemException("当前用户已被停用。");
+						}
 					}
 				}
 				AcegiHelper.setLoginInfo(loginInfo);
@@ -161,6 +165,20 @@
 		}
 	}
 
+	/**
+	 * 获取请求的action值
+	 */
+	//{"action":"getInfoByBarcode_Login",
+	private String getAction(String jsonParams) {
+		String action = "";
+		try {
+			JSONObject json = JSONObject.fromObject(jsonParams);
+			action = json.optString("action");
+		} catch (Exception e) {
+		}
+		return action;
+	}
+
 	private void clearLoginInfo() {
 		AcegiHelper.setLoginInfo(null);
 	}