From 757166f75ad921c08637796f8853ef868fb1b283 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Fri, 27 Sep 2024 09:53:34 +0800
Subject: [PATCH] 'commit'

---
 .idea/workspace.xml                            | 18 +++++++++++++-----
 .../Controller/LoginPersonController.java      | 18 ++++++++++--------
 2 files changed, 23 insertions(+), 13 deletions(-)

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 @@
   <component name="ChangeListManager">
     <list default="true" id="8a61ce26-c938-4ad4-aa09-565c63cde7d7" name="更改" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/dsRes/src/main/java/com/dsideal/resource/Base/Model/BaseModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/dsRes/src/main/java/com/dsideal/resource/Base/Model/BaseModel.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/dsBase/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java" beforeDir="false" afterPath="$PROJECT_DIR$/dsBase/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -58,7 +58,7 @@
     &quot;应用程序.ResApplication.executor&quot;: &quot;Debug&quot;
   }
 }</component>
-  <component name="RunManager" selected="应用程序.ResApplication">
+  <component name="RunManager" selected="应用程序.Publish">
     <configuration name="BaseApplication" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="com.dsideal.base.BaseApplication" />
       <module name="dsBase" />
@@ -85,6 +85,13 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
+    <configuration name="Publish" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="Publish" />
+      <module name="dsBuild" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <configuration name="ResApplication" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="com.dsideal.resource.ResApplication" />
       <module name="dsRes" />
@@ -100,8 +107,9 @@
     </configuration>
     <recent_temporary>
       <list>
-        <item itemvalue="应用程序.ResApplication" />
+        <item itemvalue="应用程序.Publish" />
         <item itemvalue="应用程序.BaseApplication" />
+        <item itemvalue="应用程序.ResApplication" />
         <item itemvalue="应用程序.GwApplication" />
       </list>
     </recent_temporary>
@@ -141,8 +149,8 @@
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/dsBase/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java</url>
-          <line>38</line>
-          <option name="timeStamp" value="1" />
+          <line>27</line>
+          <option name="timeStamp" value="2" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
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<String, Object> map = new HashMap<>();
             map.put("identity_id", identity_id);