diff --git a/dsRes/src/main/java/com/dsideal/resource/Res/Model/ResourceModel.java b/dsRes/src/main/java/com/dsideal/resource/Res/Model/ResourceModel.java index 6525eb8f..924238bf 100644 --- a/dsRes/src/main/java/com/dsideal/resource/Res/Model/ResourceModel.java +++ b/dsRes/src/main/java/com/dsideal/resource/Res/Model/ResourceModel.java @@ -49,6 +49,7 @@ public class ResourceModel { record.set("stage_id", stage_id); record.set("subject_id", subject_id); record.set("update_ts", DateTime.now()); + record.set("create_time", DateTime.now()); Db.save("t_resource_base", "resource_id_int", record); } diff --git a/dsRes/src/main/java/com/dsideal/resource/Util/JwtUtil.java b/dsRes/src/main/java/com/dsideal/resource/Util/JwtUtil.java index 4d32035b..be5c3dfc 100644 --- a/dsRes/src/main/java/com/dsideal/resource/Util/JwtUtil.java +++ b/dsRes/src/main/java/com/dsideal/resource/Util/JwtUtil.java @@ -88,7 +88,7 @@ public class JwtUtil { String secret = JwtUtil.SECRET; String token = Authorization.replaceFirst(JwtUtil.AUTHORIZATION_STARTER, ""); Claims cs = JwtUtil.getClaimsFromToken(token, secret); - String person_id = cs.get("userId").toString(); + String person_id = cs.get("person_id").toString(); return person_id; } } diff --git a/dsRes/src/main/resources/Sql/Resource.sql b/dsRes/src/main/resources/Sql/Resource.sql index 28b8d08e..c91d5c41 100644 --- a/dsRes/src/main/resources/Sql/Resource.sql +++ b/dsRes/src/main/resources/Sql/Resource.sql @@ -1,6 +1,8 @@ #namespace("Resource") -- 获取指定节点为根的子树 #sql("getStructureTree") + SELECT structure_id, parent_id FROM t_resource_structure WHERE structure_id = #para(parent_id) + UNION ALL SELECT structure_id, parent_id FROM t_resource_structure WHERE parent_id = #para(parent_id) UNION ALL SELECT b.structure_id, b.parent_id FROM t_resource_structure b