diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7559daf6..6ae99f01 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,10 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="8a61ce26-c938-4ad4-aa09-565c63cde7d7" name="更改" comment="" />
+    <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" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -50,10 +53,25 @@
     "project.structure.side.proportion": "0.0",
     "settings.editor.selected.configurable": "reference.settings.project.maven.importing",
     "vue.rearranger.settings.migration": "true",
-    "应用程序.GwApplication.executor": "Run"
+    "应用程序.BaseApplication.executor": "Debug",
+    "应用程序.GwApplication.executor": "Debug",
+    "应用程序.ResApplication.executor": "Debug"
   }
 }]]></component>
-  <component name="RunManager">
+  <component name="RunManager" selected="应用程序.ResApplication">
+    <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>
     <configuration name="GwApplication" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="com.dsideal.gw.GwApplication" />
       <module name="dsGw" />
@@ -67,8 +85,23 @@
         <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" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="com.dsideal.resource.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <recent_temporary>
       <list>
+        <item itemvalue="应用程序.ResApplication" />
+        <item itemvalue="应用程序.BaseApplication" />
         <item itemvalue="应用程序.GwApplication" />
       </list>
     </recent_temporary>
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..24f36891 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
@@ -107,12 +107,14 @@ 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");
         for (Record record : subjectPage.getList()) {
@@ -207,12 +209,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;
     }