main
HuangHai 9 months ago
parent 9a702dfa12
commit 8001c23678

@ -158,7 +158,7 @@ public class BaseModel {
} }
public boolean checkSchemeName(int scheme_id, String scheme_name, int stage_id) { 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; return Db.findFirst(sql, scheme_name, stage_id, scheme_id).getInt("c") > 0;
} }

@ -173,7 +173,7 @@ public class ResourceController extends Controller {
* @param pageSize * @param pageSize
*/ */
@Before({GET.class}) @Before({GET.class})
//@JwtCheckInterface({}) @JwtCheckInterface({})
@IsNumericInterface({"pageNum", "pageSize", "structure_id"}) @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) { public void getResourceBaseList(int stage_id, int scheme_id, int subject_id, int structure_id, String keyword, int pageNum, int pageSize) {
Page<Record> listPage = rm.getResourceBaseList(stage_id, scheme_id, subject_id, structure_id, keyword, pageNum, pageSize); Page<Record> listPage = rm.getResourceBaseList(stage_id, scheme_id, subject_id, structure_id, keyword, pageNum, pageSize);

Loading…
Cancel
Save