From 3c481b5cbbbc9639a48c2e5da2d879ffe0dfb89b Mon Sep 17 00:00:00 2001
From: HuangHai <10402852@qq.com>
Date: Fri, 27 Sep 2024 09:13:05 +0800
Subject: [PATCH] 'commit'
---
.idea/workspace.xml | 39 +++++++++++++++++--
.../resource/Base/Model/BaseModel.java | 9 ++++-
2 files changed, 43 insertions(+), 5 deletions(-)
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 @@
-
+
+
+
+
@@ -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"
}
}]]>
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -67,8 +85,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 listSubject(int stage_id, int pageNum, int pageSize) {
String sql;
+ Page 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 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 listScheme(int stage_id, int pageNum, int pageSize) {
String sql;
+ Page 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 subjectPage = Db.paginate(pageNum, pageSize, "select *", sql, stage_id);
+
return subjectPage;
}