From 301f977c7ef8d792fc0e9276de38574e49f0c76c 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 10:00:17 +0800
Subject: [PATCH] 'commit'

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

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1bb36913..0ec8e8a6 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -38,26 +38,27 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;main&quot;,
-    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;project.structure.last.edited&quot;: &quot;模块&quot;,
-    &quot;project.structure.proportion&quot;: &quot;0.0&quot;,
-    &quot;project.structure.side.proportion&quot;: &quot;0.0&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;reference.settings.project.maven.importing&quot;,
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;,
-    &quot;应用程序.BaseApplication.executor&quot;: &quot;Debug&quot;,
-    &quot;应用程序.GwApplication.executor&quot;: &quot;Debug&quot;,
-    &quot;应用程序.ResApplication.executor&quot;: &quot;Debug&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "git-widget-placeholder": "main",
+    "kotlin-language-version-configured": "true",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs_package_manager_path": "npm",
+    "project.structure.last.edited": "模块",
+    "project.structure.proportion": "0.0",
+    "project.structure.side.proportion": "0.0",
+    "settings.editor.selected.configurable": "reference.settings.project.maven.importing",
+    "vue.rearranger.settings.migration": "true",
+    "应用程序.BaseApplication.executor": "Debug",
+    "应用程序.GwApplication.executor": "Debug",
+    "应用程序.Publish.executor": "Run",
+    "应用程序.ResApplication.executor": "Debug"
   }
-}</component>
+}]]></component>
   <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" />
@@ -144,15 +145,4 @@
     <option featureType="dependencySupport" implementationName="java:org.projectlombok:lombok" />
     <option featureType="dependencySupport" implementationName="java:org.wiremock:wiremock" />
   </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <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>27</line>
-          <option name="timeStamp" value="2" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
 </project>
\ No newline at end of file
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 ad7e7c5b..df223922 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
@@ -28,16 +28,21 @@ public class LoginPersonController extends Controller {
         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) {
+            if (identity_id <= 0 || identity_id >= 4) {
+                renderJson(RetKit.renderFail("基础支撑平台只能是管理员登录访问，您的账号不是管理员！"));
+                return;
+            }
             renderJson(jo);
         } else {
+            if (identity_id != 5) {
+                renderJson(RetKit.renderFail("业务系统只支持真实人员登录！"));
+                return;
+            }
             boolean success = jo.getBoolean("success");
             String msg = jo.getString("message");
             if (!success) {