diff --git a/dsRes/src/main/java/com/dsideal/resource/Base/Controller/BaseController.java b/dsRes/src/main/java/com/dsideal/resource/Base/Controller/BaseController.java index 1115a224..bcce79ed 100644 --- a/dsRes/src/main/java/com/dsideal/resource/Base/Controller/BaseController.java +++ b/dsRes/src/main/java/com/dsideal/resource/Base/Controller/BaseController.java @@ -230,12 +230,11 @@ public class BaseController extends Controller { * @param parent_id 上级目录ID * @param scheme_id 版本ID * @param sort_id 排序号 - * @param owner_id 1:东师理想提供结构,2:用户自定义结构 */ @Before({POST.class}) @JwtCheckInterface({}) - public void addResourceStructure(String structure_name, int parent_id, int scheme_id, int sort_id, int owner_id) { - bm.addResourceStructure(structure_name, parent_id, scheme_id, sort_id, owner_id); + public void addResourceStructure(String structure_name, int parent_id, int scheme_id, int sort_id) { + bm.addResourceStructure(structure_name, parent_id, scheme_id, sort_id); renderJson(RetKit.renderSuccess("操作成功")); } @@ -260,13 +259,12 @@ public class BaseController extends Controller { * @param parent_id 上级目录ID * @param scheme_id 版本ID * @param sort_id 排序号 - * @param owner_id 1:东师理想提供结构,2:用户自定义结构 */ @Before({POST.class}) @JwtCheckInterface({}) @IsNumericInterface({"structure_id"}) - public void updateResourceStructureById(int structure_id, String structure_name, int parent_id, int scheme_id, int sort_id, int owner_id) { - bm.updateResourceStructureById(structure_id, structure_name, parent_id, scheme_id, sort_id, owner_id); + public void updateResourceStructureById(int structure_id, String structure_name, int parent_id, int scheme_id, int sort_id) { + bm.updateResourceStructureById(structure_id, structure_name, parent_id, scheme_id, sort_id); renderJson(RetKit.renderSuccess("操作成功")); } 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 70a067b5..d8004543 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 @@ -184,7 +184,7 @@ public class BaseModel { record.set("sort_id", sort_id); Db.save("t_resource_scheme", "scheme_id", record); //需要同步增加t_resource_structure表中的数据 - addResourceStructure(scheme_name, -1, record.getInt("id"), 1, owner_id); + addResourceStructure(scheme_name, -1, record.getInt("id"), 1); } /** @@ -256,15 +256,13 @@ public class BaseModel { * @param parent_id 上级目录ID * @param scheme_id 版本ID * @param sort_id 排序号 - * @param owner_id 1:东师理想提供结构,2:用户自定义结构 */ - public void addResourceStructure(String structure_name, int parent_id, int scheme_id, int sort_id, int owner_id) { + public void addResourceStructure(String structure_name, int parent_id, int scheme_id, int sort_id) { Record record = new Record(); record.set("structure_name", structure_name); record.set("parent_id", parent_id); record.set("scheme_id", scheme_id); record.set("sort_id", sort_id); - record.set("owner_id", owner_id); Db.save("t_resource_structure", "structure_id", record); } @@ -287,11 +285,10 @@ public class BaseModel { * @param parent_id 上级目录ID * @param scheme_id 版本ID * @param sort_id 排序号 - * @param owner_id 1:东师理想提供结构,2:用户自定义结构 */ - public void updateResourceStructureById(int structure_id, String structure_name, int parent_id, int scheme_id, int sort_id, int owner_id) { - String sql = "update t_resource_structure set structure_name =?, parent_id =?, scheme_id =?, sort_id =?, owner_id =? where structure_id =?"; - Db.update(sql, structure_name, parent_id, scheme_id, sort_id, owner_id, structure_id); + public void updateResourceStructureById(int structure_id, String structure_name, int parent_id, int scheme_id, int sort_id) { + String sql = "update t_resource_structure set structure_name =?, parent_id =?, scheme_id =?, sort_id =? where structure_id =?"; + Db.update(sql, structure_name, parent_id, scheme_id, sort_id, structure_id); } /**