From 49f5ca796b37abcb53d005ace8658a0a0cbd6f2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Fri, 19 May 2023 16:24:20 +0800
Subject: [PATCH] 'commit'

---
 src/main/resource/Sql/base.sql | 7 ++++---
 target/classes/Sql/base.sql    | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/resource/Sql/base.sql b/src/main/resource/Sql/base.sql
index 3963b91..79e1546 100644
--- a/src/main/resource/Sql/base.sql
+++ b/src/main/resource/Sql/base.sql
@@ -24,16 +24,17 @@
 
   --  获取单位类型与职务+分管信息树数据指定结点的信息
   #sql("getOrgTypePrincipalshipByParentId")
-      select t1.id,t1.code,t1.name,t1.parent_id as pId,t1.sort_id,t1.b_use,t1.is_school,t1.level,t1.bureau_level,
+      select t1.id,t1.code,t1.name,t1.parent_id as pid,t1.sort_id,t1.b_use,t1.is_school,t1.level,t1.bureau_level,
         (select count(1) from t_base_org_type_principalship as t2 where t2.parent_id=t1.id) as is_leaf
       from t_base_org_type_principalship as t1 where t1.parent_id=#para(0) and t1.b_use=1  order by sort_id
   #end
 
   -- 和上面的是一个东西，但要细分一下，比如幼儿园+中小学
   #sql("getOrgTypePrincipalshipByParentIdAndBigType")
-      select t1.id,t1.name,t1.parent_id as pId,t1.sort_id,t1.b_use,t1.is_school,t1.level,t1.bureau_level,
+      select t1.id,t1.name,t1.parent_id as pid,t1.sort_id,t1.b_use,t1.is_school,t1.level,t1.bureau_level,
         (select count(1) from t_base_org_type_principalship as t2 where t2.parent_id=t1.id) as is_leaf
-      from t_base_org_type_principalship as t1 where t1.parent_id=#para(0) and t1.b_use=1 and t1.is_school=#para(1) order by sort_id
+      from t_base_org_type_principalship as t1 where t1.parent_id=#para(0) and t1.b_use=1
+      and t1.is_school=#para(1) order by sort_id asc
   #end
 
   --  修改一个OrgTypePrincipalship节点
diff --git a/target/classes/Sql/base.sql b/target/classes/Sql/base.sql
index 3963b91..79e1546 100644
--- a/target/classes/Sql/base.sql
+++ b/target/classes/Sql/base.sql
@@ -24,16 +24,17 @@
 
   --  获取单位类型与职务+分管信息树数据指定结点的信息
   #sql("getOrgTypePrincipalshipByParentId")
-      select t1.id,t1.code,t1.name,t1.parent_id as pId,t1.sort_id,t1.b_use,t1.is_school,t1.level,t1.bureau_level,
+      select t1.id,t1.code,t1.name,t1.parent_id as pid,t1.sort_id,t1.b_use,t1.is_school,t1.level,t1.bureau_level,
         (select count(1) from t_base_org_type_principalship as t2 where t2.parent_id=t1.id) as is_leaf
       from t_base_org_type_principalship as t1 where t1.parent_id=#para(0) and t1.b_use=1  order by sort_id
   #end
 
   -- 和上面的是一个东西，但要细分一下，比如幼儿园+中小学
   #sql("getOrgTypePrincipalshipByParentIdAndBigType")
-      select t1.id,t1.name,t1.parent_id as pId,t1.sort_id,t1.b_use,t1.is_school,t1.level,t1.bureau_level,
+      select t1.id,t1.name,t1.parent_id as pid,t1.sort_id,t1.b_use,t1.is_school,t1.level,t1.bureau_level,
         (select count(1) from t_base_org_type_principalship as t2 where t2.parent_id=t1.id) as is_leaf
-      from t_base_org_type_principalship as t1 where t1.parent_id=#para(0) and t1.b_use=1 and t1.is_school=#para(1) order by sort_id
+      from t_base_org_type_principalship as t1 where t1.parent_id=#para(0) and t1.b_use=1
+      and t1.is_school=#para(1) order by sort_id asc
   #end
 
   --  修改一个OrgTypePrincipalship节点