Merge branch 'main' of http://10.10.14.176:3000/huanghai/dsProject

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);
     }
 

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;
     }
 }

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