diff --git a/.idea/workspace.xml b/.idea/workspace.xml index ad541004..1bb36913 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,7 +6,7 @@ - + - + + + - + + @@ -141,8 +149,8 @@ file://$PROJECT_DIR$/dsBase/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java - 38 - diff --git a/dsBase/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java b/dsBase/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java index e9db6213..ad7e7c5b 100644 --- a/dsBase/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java +++ b/dsBase/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java @@ -26,6 +26,15 @@ public class LoginPersonController extends Controller { @Before({POST.class}) public void doLogin(String username, String password, String platform, int forVue) { JSONObject jo = model.doLogin(username, password, platform, getResponse()); + + int identity_id = jo.getInteger("identity_id"); + if (identity_id <= 0 || identity_id >= 4) { + renderJson(RetKit.renderFail("基础支撑平台只能是管理员登录访问,您的账号不是管理员!")); + return; + } + String person_id = jo.getString("person_id"); + String bureau_id = jo.getString("bureau_id"); + String person_name = jo.getString("person_name"); if (forVue == 0) { renderJson(jo); } else { @@ -35,14 +44,7 @@ public class LoginPersonController extends Controller { renderJson(RetKit.renderFail(msg)); return; } - int identity_id = jo.getInteger("identity_id"); - if (identity_id <= 0 || identity_id >= 4) { - renderJson(RetKit.renderFail("基础支撑平台只能是管理员登录访问,您的账号不是管理员!")); - return; - } - String person_id = jo.getString("person_id"); - String bureau_id = jo.getString("bureau_id"); - String person_name = jo.getString("person_name"); + String jwt = jo.getString("jwt"); Map map = new HashMap<>(); map.put("identity_id", identity_id);