diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3772b4e4..b4604fce 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,7 +5,11 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="8a61ce26-c938-4ad4-aa09-565c63cde7d7" name="更改" comment="">
+<<<<<<< HEAD
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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" />
+>>>>>>> 5521982ae4d5e06a3e69ee4c8fe13fa6e869ef95
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -25,6 +29,7 @@
     <option name="importingSettings">
       <MavenImportingSettings>
         <option name="vmOptionsForImporter" value="-Xms1024m -Xmx2048m" />
+        <option name="workspaceImportForciblyTurnedOn" value="true" />
       </MavenImportingSettings>
     </option>
   </component>
@@ -37,6 +42,7 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
+<<<<<<< HEAD
   <component name="PropertiesComponent">{
   &quot;keyToString&quot;: {
     &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
@@ -56,6 +62,42 @@
   }
 }</component>
   <component name="RunManager" selected="应用程序.Publish">
+=======
+  <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": "preferences.pluginManager",
+    "vue.rearranger.settings.migration": "true",
+    "应用程序.BaseApplication.executor": "Run",
+    "应用程序.GwApplication.executor": "Run",
+    "应用程序.ResApplication.executor": "Run"
+  }
+}]]></component>
+  <component name="RunManager" selected="应用程序.BaseApplication">
+    <configuration name="BaseApplication" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="com.dsideal.base.BaseApplication" />
+      <module name="dsBase" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="com.dsideal.base.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+>>>>>>> 5521982ae4d5e06a3e69ee4c8fe13fa6e869ef95
     <configuration name="GwApplication" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="com.dsideal.gw.GwApplication" />
       <module name="dsGw" />
@@ -69,25 +111,42 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
+<<<<<<< HEAD
     <configuration name="Publish" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="Publish" />
       <module name="dsBuild" />
+=======
+    <configuration name="ResApplication" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="com.dsideal.resource.ResApplication" />
+      <module name="dsRes" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="com.dsideal.resource.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+>>>>>>> 5521982ae4d5e06a3e69ee4c8fe13fa6e869ef95
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
     <recent_temporary>
       <list>
+<<<<<<< HEAD
         <item itemvalue="应用程序.Publish" />
+=======
+        <item itemvalue="应用程序.BaseApplication" />
+>>>>>>> 5521982ae4d5e06a3e69ee4c8fe13fa6e869ef95
         <item itemvalue="应用程序.GwApplication" />
+        <item itemvalue="应用程序.ResApplication" />
       </list>
     </recent_temporary>
   </component>
   <component name="SharedIndexes">
     <attachedChunks>
       <set>
-        <option value="bundled-jdk-9823dce3aa75-b114ca120d71-intellij.indexing.shared.core-IU-242.21829.142" />
-        <option value="bundled-js-predefined-d6986cc7102b-7c0b70fcd90d-JavaScript-IU-242.21829.142" />
+        <option value="bundled-jdk-9f38398b9061-39b83d9b5494-intellij.indexing.shared.core-IU-241.17011.79" />
+        <option value="bundled-js-predefined-1d06a55b98c1-0b3e54e931b4-JavaScript-IU-241.17011.79" />
       </set>
     </attachedChunks>
   </component>
@@ -100,7 +159,12 @@
       <option name="presentableId" value="Default" />
       <updated>1727339918298</updated>
       <workItem from="1727339920435" duration="293000" />
+<<<<<<< HEAD
       <workItem from="1727340224328" duration="5888000" />
+=======
+      <workItem from="1727340224328" duration="3509000" />
+      <workItem from="1727399806173" duration="1616000" />
+>>>>>>> 5521982ae4d5e06a3e69ee4c8fe13fa6e869ef95
     </task>
     <servers />
   </component>
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 a2994965..e9db6213 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
@@ -36,6 +36,10 @@ public class LoginPersonController extends Controller {
                 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");
diff --git a/dsRes/src/main/java/com/dsideal/resource/Base/Model/BaseModel.java b/dsRes/src/main/java/com/dsideal/resource/Base/Model/BaseModel.java
index 2c748532..89580163 100644
--- a/dsRes/src/main/java/com/dsideal/resource/Base/Model/BaseModel.java
+++ b/dsRes/src/main/java/com/dsideal/resource/Base/Model/BaseModel.java
@@ -4,7 +4,9 @@ import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Page;
 import com.jfinal.plugin.activerecord.Record;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 public class BaseModel {
     /**
@@ -17,6 +19,15 @@ public class BaseModel {
         return Db.find(sql);
     }
 
+    public Map<Integer, String> getStageMap() {
+        List<Record> list = getStageList();
+        Map<Integer, String> map = new HashMap<>();
+        for (Record record : list) {
+            map.put(record.getInt("stage_id"), record.getStr("stage_name"));
+        }
+        return map;
+    }
+
     public Record getStage(int stage_id) {
         String sql = "select * from t_dm_stage where stage_id=?";
         return Db.findFirst(sql, stage_id);
@@ -107,16 +118,18 @@ public class BaseModel {
      */
     public Page<Record> listSubject(int stage_id, int pageNum, int pageSize) {
         String sql;
+        Page<Record> subjectPage;
         if (stage_id == 0) {
             sql = "from t_dm_subject order by sort_id";
+            subjectPage = Db.paginate(pageNum, pageSize, "select *", sql);
         } else {
             sql = "from t_dm_subject where stage_id=? order by sort_id";
+            subjectPage = Db.paginate(pageNum, pageSize, "select *", sql, stage_id);
         }
-        Page<Record> subjectPage = Db.paginate(pageNum, pageSize, "select *", sql, stage_id);
 
-        String stageName = getStage(stage_id).getStr("stage_name");
+        Map<Integer, String> map = getStageMap();
         for (Record record : subjectPage.getList()) {
-            record.set("stage_name", stageName);
+            record.set("stage_name", map.get(record.getInt("stage_id")));
         }
         return subjectPage;
     }
@@ -207,12 +220,15 @@ public class BaseModel {
      */
     public Page<Record> listScheme(int stage_id, int pageNum, int pageSize) {
         String sql;
+        Page<Record> subjectPage;
         if (stage_id == 0) {
             sql = "from t_resource_scheme  limit ?,?";
+            subjectPage = Db.paginate(pageNum, pageSize, "select *", sql);
         } else {
             sql = "from t_resource_scheme where stage_id=? limit ?,?";
+            subjectPage = Db.paginate(pageNum, pageSize, "select *", sql, stage_id);
         }
-        Page<Record> subjectPage = Db.paginate(pageNum, pageSize, "select *", sql, stage_id);
+
         return subjectPage;
     }