From 64692c521aeec1fe3d8b272b96274e0f8511975a Mon Sep 17 00:00:00 2001 From: "rui.zhang" Date: Wed, 4 May 2016 12:10:45 +0800 Subject: [PATCH] =?UTF-8?q?platform=20permission=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/lyms/platform/common/utils/LoginUtil.java | 8 ++------ .../com/lyms/platform/operate/web/controller/UsersController.java | 5 +++-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/LoginUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/LoginUtil.java index 6be7ba0..f55f37e 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/LoginUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/LoginUtil.java @@ -83,9 +83,7 @@ public class LoginUtil { LoginContext loginState = new LoginContext(); if (200 == statusCode) { loginState = JsonUtil.str2Obj(result, LoginContext.class); - if (0 == loginState.getErrorcode()) { - return loginState; - } + return loginState; } } catch (Exception e) { e.printStackTrace(); @@ -112,9 +110,7 @@ public class LoginUtil { LoginContext loginState = new LoginContext(); if (200 == statusCode) { loginState = JsonUtil.str2Obj(result, LoginContext.class); - if (0 == loginState.getErrorcode()) { - return loginState; - } + return loginState; } } catch (Exception e) { e.printStackTrace(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java index dc192f3..ae5964e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java @@ -198,7 +198,8 @@ public class UsersController extends BaseController { return; } - LoginContext loginContext = null; + LoginContext loginContext = new LoginContext(); + loginContext.setErrormsg("服务器内部错误！"); if(null != code) { loginContext =LoginUtil.login(account, code, typeId, token); } @@ -206,7 +207,7 @@ public class UsersController extends BaseController { loginContext = LoginUtil.loginHospitalUser(account, password, typeId, token); } - if(null != loginContext) { + if(null != loginContext && loginContext.getErrorcode().equals(0)) { Users users1 = new Users(); users1.setId(users.get(0).getId()); users1.setLastLoginTime(new Date()); -- 1.8.3.1