From 8001c236786c0b9341e9665b967d2005760f0744 Mon Sep 17 00:00:00 2001 From: HuangHai <10402852@qq.com> Date: Tue, 5 Nov 2024 13:44:02 +0800 Subject: [PATCH] 'commit' --- .../main/java/com/dsideal/resource/Base/Model/BaseModel.java | 2 +- .../com/dsideal/resource/Res/Controller/ResourceController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 bc97138a..79f5f4e4 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 @@ -158,7 +158,7 @@ public class BaseModel { } public boolean checkSchemeName(int scheme_id, String scheme_name, int stage_id) { - String sql = "select count(1) as c from t_resource_scheme where scheme_name=? and stage_id=? and scheme_id<>?"; + String sql = "select count(1) as c from t_resource_scheme where scheme_name=? and stage_id=? and scheme_id<>? and b_use=1"; return Db.findFirst(sql, scheme_name, stage_id, scheme_id).getInt("c") > 0; } diff --git a/dsRes/src/main/java/com/dsideal/resource/Res/Controller/ResourceController.java b/dsRes/src/main/java/com/dsideal/resource/Res/Controller/ResourceController.java index 01094715..b5055cc1 100644 --- a/dsRes/src/main/java/com/dsideal/resource/Res/Controller/ResourceController.java +++ b/dsRes/src/main/java/com/dsideal/resource/Res/Controller/ResourceController.java @@ -173,7 +173,7 @@ public class ResourceController extends Controller { * @param pageSize 每页数量 */ @Before({GET.class}) - //@JwtCheckInterface({}) + @JwtCheckInterface({}) @IsNumericInterface({"pageNum", "pageSize", "structure_id"}) public void getResourceBaseList(int stage_id, int scheme_id, int subject_id, int structure_id, String keyword, int pageNum, int pageSize) { Page listPage = rm.getResourceBaseList(stage_id, scheme_id, subject_id, structure_id, keyword, pageNum, pageSize);