From 023af85d1a5e032e937f4fabcea6999c7f830c3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Fri, 19 Jul 2024 16:56:21 +0800 Subject: [PATCH] 'commit' --- .../QingLong/Organization/Model/OrganizationModel.java | 1 - src/main/java/com/dsideal/QingLong/Util/PkUtil.java | 1 - src/main/resource/Sql/organization.sql | 10 +++++----- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/dsideal/QingLong/Organization/Model/OrganizationModel.java b/src/main/java/com/dsideal/QingLong/Organization/Model/OrganizationModel.java index 383ab858..3b828c52 100644 --- a/src/main/java/com/dsideal/QingLong/Organization/Model/OrganizationModel.java +++ b/src/main/java/com/dsideal/QingLong/Organization/Model/OrganizationModel.java @@ -123,7 +123,6 @@ public class OrganizationModel { long org_pk_num = PkUtil.GetOrgNumPk(1); record.set("main_school_id", org_id); record.set("bureau_id", org_id); - record.set("org_pk_num", org_pk_num); Map map = getAreaInfoById(parent_org_id); city_id = map.get("city_id"); area_id = map.get("area_id"); diff --git a/src/main/java/com/dsideal/QingLong/Util/PkUtil.java b/src/main/java/com/dsideal/QingLong/Util/PkUtil.java index 7eb59522..699b2766 100644 --- a/src/main/java/com/dsideal/QingLong/Util/PkUtil.java +++ b/src/main/java/com/dsideal/QingLong/Util/PkUtil.java @@ -61,7 +61,6 @@ public class PkUtil { identityMap.put(4, "dw"); identityMap.put(5, "tea"); identityMap.put(6, "stu"); - identityMap.put(7, "par"); } } diff --git a/src/main/resource/Sql/organization.sql b/src/main/resource/Sql/organization.sql index 86986650..d96a8560 100644 --- a/src/main/resource/Sql/organization.sql +++ b/src/main/resource/Sql/organization.sql @@ -3,12 +3,12 @@ -- 获取组织机构的最大主键号 #sql("getMaxPkByOrg") - select COALESCE(max(org_pk_num),0) as org_pk_num from t_base_organization + select id_int as org_pk_num from t_base_organization #end -- 获取指定单位或组织机构的信息 #sql("getOrgInfoById") select org_id,org_code,org_name,parent_id,org_type_id,school_type_id,sort_id,create_time,is_virtual,third_party_id, - update_ts,b_use,org_pk_num,COALESCE(city_id, '-1') as city_id,COALESCE(area_id, '-1') as area_id, + update_ts,b_use,COALESCE(city_id, '-1') as city_id,COALESCE(area_id, '-1') as area_id, COALESCE(main_school_id, '-1') as main_school_id,bureau_id,property_id,level_id from t_base_organization where org_id=? and b_use=1 #end @@ -48,7 +48,7 @@ -- 获取学校列表 #sql("getSchoolList") select t1.org_id,t1.org_code,t1.org_name,t1.parent_id,t1.org_type_id,t1.school_type_id,t1.sort_id, - t1.create_time,t1.update_ts,t1.b_use,t1.org_pk_num,t1.city_id,t1.area_id,t1.main_school_id,t1.bureau_id, + t1.create_time,t1.update_ts,t1.b_use,t1.city_id,t1.area_id,t1.main_school_id,t1.bureau_id, (select t2.school_type_name from t_dm_schooltype as t2 where t2.school_type_id=t1.school_type_id) as school_type_name from t_base_organization as t1 where t1.parent_id=#para(0) and t1.b_use=1 and t1.school_type_id>0 #end @@ -57,7 +57,7 @@ #sql("getSchoolListBySchoolType") select t1.org_id,t1.org_code,t1.org_name,t1.parent_id,t1.org_type_id, t1.school_type_id,t1.sort_id,t1.create_time,t1.update_ts,t1.b_use, - t1.org_pk_num,t1.city_id,t1.area_id,t1.main_school_id,t1.bureau_id, + t1.city_id,t1.area_id,t1.main_school_id,t1.bureau_id, (select t2.school_type_name from t_dm_schooltype as t2 where t2.school_type_id=t1.school_type_id) as school_type_name from t_base_organization as t1 where t1.parent_id=#para(0) and t1.b_use=1 and t1.school_type_id =#para(1) #end @@ -68,7 +68,7 @@ select t1.org_id,t1.org_code,t1.org_name,t1.parent_id,t1.org_type_id, t2.name as org_type_name, t1.school_type_id,t1.sort_id,t1.create_time, - t1.update_ts,t1.b_use,t1.org_pk_num,t1.city_id,t1.area_id,t1.main_school_id,t1.bureau_id + t1.update_ts,t1.b_use,t1.city_id,t1.area_id,t1.main_school_id,t1.bureau_id from t_base_organization as t1 inner join t_base_org_type_principalship as t2 on t2.id=t1.org_type_id where t1.parent_id=#para(0) and t1.school_type_id<=0 and t1.b_use=1 order by t1.sort_id,t1.update_ts