From d6338ac22397d19f3d3b7e6f53615c06cf40123f Mon Sep 17 00:00:00 2001 From: dxfeng Date: Fri, 2 Sep 2022 09:04:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=A1=A8=E7=BB=93=E6=9E=84SQL=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/删除表结构/MySQL_delete.sql | 31 ++ docs/删除表结构/Oracle_delete.sql | 308 ++++++++++++++++++ docs/删除表结构/SqlServer_delete.sql | 3 + docs/脚本/Mysql/表结构、初始化数据.sql | 31 -- docs/脚本/Oracle/表结构、初始化数据Oracle.sql | 308 ++++-------------- docs/脚本/SqlServer/表结构、基础数据.sql | 4 +- 6 files changed, 399 insertions(+), 286 deletions(-) diff --git a/docs/删除表结构/MySQL_delete.sql b/docs/删除表结构/MySQL_delete.sql index e69de29b..730bcb1a 100644 --- a/docs/删除表结构/MySQL_delete.sql +++ b/docs/删除表结构/MySQL_delete.sql @@ -0,0 +1,31 @@ +DROP TABLE IF EXISTS `hr_log`; +DROP TABLE IF EXISTS `jcl_field_extendgroup`; +DROP TABLE IF EXISTS `jcl_field_extendinfo`; +DROP TABLE IF EXISTS `jcl_field_extendtitle`; +DROP TABLE IF EXISTS `jcl_org_comp`; +DROP TABLE IF EXISTS `jcl_org_compext`; +DROP TABLE IF EXISTS `jcl_org_compext_dt1`; +DROP TABLE IF EXISTS `jcl_org_dept`; +DROP TABLE IF EXISTS `jcl_org_deptext`; +DROP TABLE IF EXISTS `jcl_org_deptext_dt1`; +DROP TABLE IF EXISTS `jcl_org_grade`; +DROP TABLE IF EXISTS `jcl_org_hrmrelation`; +DROP TABLE IF EXISTS `jcl_org_hrmresource`; +DROP TABLE IF EXISTS `jcl_org_hrmresourceext`; +DROP TABLE IF EXISTS `jcl_org_hrmresourceext_dt1`; +DROP TABLE IF EXISTS `jcl_org_job`; +DROP TABLE IF EXISTS `jcl_org_jobdt`; +DROP TABLE IF EXISTS `jcl_org_jobext`; +DROP TABLE IF EXISTS `jcl_org_jobext_dt1`; +DROP TABLE IF EXISTS `jcl_org_level`; +DROP TABLE IF EXISTS `jcl_org_map`; +DROP TABLE IF EXISTS `jcl_org_post`; +DROP TABLE IF EXISTS `jcl_org_post_info`; +DROP TABLE IF EXISTS `jcl_org_scheme`; +DROP TABLE IF EXISTS `jcl_org_sequence`; +DROP TABLE IF EXISTS `jcl_org_staff`; +DROP TABLE IF EXISTS `jcl_org_staffplan`; +DROP TABLE IF EXISTS `jcl_org_staffs`; +DROP TABLE IF EXISTS `jcl_import_history`; +DROP TABLE IF EXISTS `jcl_import_history_detail`; +DROP TABLE IF EXISTS `JCL_INFO`; diff --git a/docs/删除表结构/Oracle_delete.sql b/docs/删除表结构/Oracle_delete.sql index e69de29b..afe0bc56 100644 --- a/docs/删除表结构/Oracle_delete.sql +++ b/docs/删除表结构/Oracle_delete.sql @@ -0,0 +1,308 @@ +create or replace procedure jcl_droptable( + p_table in varchar2 +) is + v_count number(10); +begin +select count(*) into v_count from user_tables where table_name = upper(p_table); +if v_count > 0 then + execute immediate 'drop table ' || p_table ; +end if; +end jcl_droptable; +/ + +create or replace procedure jcl_dropsequence( + p_sequence in varchar2 +) is + v_count number(10); +begin +select count(*) into v_count from user_sequences where sequence_name = upper(p_sequence); +if v_count > 0 then + execute immediate 'drop sequence ' || p_sequence ; +end if; +end jcl_dropsequence; +/ + +begin + jcl_droptable('JCL_ORG_SCHEME'); +END; +/ + +begin + jcl_droptable('JCL_ORG_LEVEL'); +END; +/ + +begin + jcl_droptable('JCL_ORG_GRADE'); +END; +/ + +begin + jcl_droptable('JCL_ORG_SEQUENCE'); +END; +/ + +begin + jcl_droptable('JCL_ORG_POST'); +END; +/ + +begin + jcl_droptable('JCL_ORG_POST_INFO'); +END; +/ + +begin + jcl_droptable('JCL_ORG_COMP'); +END; +/ + +begin + jcl_droptable('JCL_FIELD_EXTENDGROUP'); +END; +/ + +begin + jcl_droptable('JCL_FIELD_EXTENDTITLE'); +END; +/ + +begin + jcl_droptable('JCL_FIELD_EXTENDINFO'); +END; +/ + +begin + jcl_droptable('JCL_ORG_COMPEXT'); +END; +/ + +begin + jcl_droptable('JCL_ORG_COMPEXT_DT1'); +END; +/ + +begin + jcl_droptable('JCL_ORG_DEPT'); +END; +/ + +begin + jcl_droptable('JCL_ORG_DEPTEXT'); +END; +/ + +begin + jcl_droptable('JCL_ORG_DEPTEXT_DT1'); +END; +/ + +begin + jcl_droptable('JCL_ORG_JOB'); +END; +/ + +begin + jcl_droptable('JCL_ORG_JOBDT'); +END; +/ + +begin + jcl_droptable('JCL_ORG_JOBEXT'); +END; +/ + +begin + jcl_droptable('JCL_ORG_JOBEXT_DT1'); +END; +/ + +begin + jcl_droptable('JCL_ORG_HRMRESOURCE'); +END; +/ + +begin + jcl_droptable('JCL_ORG_HRMRESOURCEEXT'); +END; +/ + +begin + jcl_droptable('JCL_ORG_HRMRESOURCEEXT_DT1'); +END; +/ + +begin + jcl_droptable('JCL_ORG_STAFFPLAN'); +END; +/ + +begin + jcl_droptable('JCL_ORG_STAFF'); +END; +/ + +begin + jcl_droptable('JCL_ORG_STAFFS'); +END; +/ + +begin + jcl_droptable('HR_LOG'); +END; +/ + +begin + jcl_droptable('JCL_ORG_HRMRELATION'); +END; +/ + +begin + jcl_droptable('JCL_ORG_MAP'); +END; +/ + +begin + jcl_droptable('JCL_IMPORT_HISTORY'); +END; +/ + +begin + jcl_droptable('JCL_IMPORT_HISTORY_DETAIL'); +END; +/ + +begin + jcl_droptable('JCL_INFO'); +END; +/ + +BEGIN + jcl_dropsequence('JCL_ORG_SCHEME_ID'); +END; +/ + +BEGIN + jcl_dropsequence('JCL_ORG_LEVEL_ID'); +END; +/ + +BEGIN + jcl_dropsequence('JCL_ORG_GRADE_ID'); +END; +/ + +BEGIN + jcl_dropsequence('JCL_ORG_SEQUENCE_ID'); +END; +/ + +BEGIN + jcl_dropsequence('JCL_ORG_POST_ID'); +END; +/ + +BEGIN + jcl_dropsequence('JCL_ORG_POST_INFO_ID'); +END; +/ + +BEGIN + jcl_dropsequence('JCL_ORG_COMP_ID'); +END; +/ + +BEGIN + jcl_dropsequence('JCL_FIELD_GROUP_ID'); +END; +/ + +BEGIN + jcl_dropsequence('JCL_FIELD_TITLE_ID'); +END; +/ + +BEGIN + jcl_dropsequence('JCL_FIELD_INFO_ID'); +END; +/ + +BEGIN + jcl_dropsequence('JCL_ORG_COMPEXT_DT1_ID'); +END; +/ + +BEGIN + jcl_dropsequence('JCL_ORG_DEPT_ID'); +END; +/ + +BEGIN + jcl_dropsequence('JCL_ORG_DEPTEXT_DT1_ID'); +END; +/ + +BEGIN + jcl_dropsequence('JCL_ORG_JOB_ID'); +END; +/ + +BEGIN + jcl_dropsequence('JCL_ORG_JOBDT_ID'); +END; +/ + +BEGIN + jcl_dropsequence('JCL_ORG_JOBEXT_DT1_ID'); +END; +/ + +BEGIN + jcl_dropsequence('JCL_ORG_HRM_ID'); +END; +/ + +BEGIN + jcl_dropsequence('JCL_ORG_HRMEXT_DT1_ID'); +END; +/ + +BEGIN + jcl_dropsequence('JCL_ORG_STAFFPLAN_ID'); +END; +/ + +BEGIN + jcl_dropsequence('JCL_ORG_STAFF_ID'); +END; +/ + +BEGIN + jcl_dropsequence('JCL_ORG_STAFFS_ID'); +END; +/ + +BEGIN + jcl_dropsequence('JCL_ORG_MAP_FID'); +END; +/ + +BEGIN + jcl_dropsequence('HR_LOG_ID'); +END; +/ + +BEGIN + jcl_dropsequence('JCL_IMPORT_HISTORY_ID'); +END; +/ + +BEGIN + jcl_dropsequence('JCL_IMPORT_DETAIL_ID'); +END; +/ + +BEGIN + jcl_dropsequence('JCL_INFO_ID'); +END; +/ \ No newline at end of file diff --git a/docs/删除表结构/SqlServer_delete.sql b/docs/删除表结构/SqlServer_delete.sql index aa3aef23..1245d768 100644 --- a/docs/删除表结构/SqlServer_delete.sql +++ b/docs/删除表结构/SqlServer_delete.sql @@ -116,4 +116,7 @@ DROP TABLE [dbo].[JCL_IMPORT_HISTORY_DETAIL] IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[JCL_IMPORT_HISTORY]') AND type IN ('U')) DROP TABLE [dbo].[JCL_IMPORT_HISTORY] + GO + IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[jcl_info]') AND type IN ('U')) +DROP TABLE [dbo].[jcl_info] GO \ No newline at end of file diff --git a/docs/脚本/Mysql/表结构、初始化数据.sql b/docs/脚本/Mysql/表结构、初始化数据.sql index 851a267a..5497f737 100644 --- a/docs/脚本/Mysql/表结构、初始化数据.sql +++ b/docs/脚本/Mysql/表结构、初始化数据.sql @@ -1,5 +1,4 @@ -DROP TABLE IF EXISTS `hr_log`; CREATE TABLE `hr_log` ( `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '日志ID', `operate_desc` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '操作详细说明', @@ -20,7 +19,6 @@ CREATE TABLE `hr_log` ( ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; -DROP TABLE IF EXISTS `jcl_field_extendgroup`; CREATE TABLE `jcl_field_extendgroup` ( `id` int(11) NOT NULL AUTO_INCREMENT, `extend_type` int(11) NULL DEFAULT NULL, @@ -37,7 +35,6 @@ CREATE TABLE `jcl_field_extendgroup` ( ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; -DROP TABLE IF EXISTS `jcl_field_extendinfo`; CREATE TABLE `jcl_field_extendinfo` ( `id` int(11) NOT NULL AUTO_INCREMENT, `extend_type` int(11) NULL DEFAULT NULL, @@ -66,7 +63,6 @@ CREATE TABLE `jcl_field_extendinfo` ( ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; -DROP TABLE IF EXISTS `jcl_field_extendtitle`; CREATE TABLE `jcl_field_extendtitle` ( `id` int(11) NOT NULL AUTO_INCREMENT, `group_id` int(11) NULL DEFAULT NULL, @@ -82,7 +78,6 @@ CREATE TABLE `jcl_field_extendtitle` ( ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; -DROP TABLE IF EXISTS `jcl_org_comp`; CREATE TABLE `jcl_org_comp` ( `id` int(11) NOT NULL AUTO_INCREMENT, `comp_no` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, @@ -105,7 +100,6 @@ CREATE TABLE `jcl_org_comp` ( ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; -DROP TABLE IF EXISTS `jcl_org_compext`; CREATE TABLE `jcl_org_compext` ( `id` int(11) NOT NULL, `creator` int(11) NULL DEFAULT NULL, @@ -118,7 +112,6 @@ CREATE TABLE `jcl_org_compext` ( ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; -DROP TABLE IF EXISTS `jcl_org_compext_dt1`; CREATE TABLE `jcl_org_compext_dt1` ( `id` int(11) NOT NULL AUTO_INCREMENT, `mainid` int(11) NULL DEFAULT NULL, @@ -134,7 +127,6 @@ CREATE TABLE `jcl_org_compext_dt1` ( ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; -DROP TABLE IF EXISTS `jcl_org_dept`; CREATE TABLE `jcl_org_dept` ( `id` int(11) NOT NULL AUTO_INCREMENT, `dept_no` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, @@ -156,7 +148,6 @@ CREATE TABLE `jcl_org_dept` ( ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; -DROP TABLE IF EXISTS `jcl_org_deptext`; CREATE TABLE `jcl_org_deptext` ( `id` int(11) NOT NULL AUTO_INCREMENT, `creator` int(11) NULL DEFAULT NULL, @@ -167,7 +158,6 @@ CREATE TABLE `jcl_org_deptext` ( ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; -DROP TABLE IF EXISTS `jcl_org_deptext_dt1`; CREATE TABLE `jcl_org_deptext_dt1` ( `id` int(11) NOT NULL AUTO_INCREMENT, `mainid` int(11) NULL DEFAULT NULL, @@ -179,7 +169,6 @@ CREATE TABLE `jcl_org_deptext_dt1` ( ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; -DROP TABLE IF EXISTS `jcl_org_grade`; CREATE TABLE `jcl_org_grade` ( `id` int(11) NOT NULL AUTO_INCREMENT, `grade_no` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, @@ -197,7 +186,6 @@ CREATE TABLE `jcl_org_grade` ( ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; -DROP TABLE IF EXISTS `jcl_org_hrmrelation`; CREATE TABLE `jcl_org_hrmrelation` ( `id` int(11) NOT NULL, `scheme_id` int(11) NULL DEFAULT NULL, @@ -217,7 +205,6 @@ CREATE TABLE `jcl_org_hrmrelation` ( ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; -DROP TABLE IF EXISTS `jcl_org_hrmresource`; CREATE TABLE `jcl_org_hrmresource` ( `id` int(11) NOT NULL AUTO_INCREMENT, `work_code` varchar(60) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, @@ -289,7 +276,6 @@ CREATE TABLE `jcl_org_hrmresource` ( ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; -DROP TABLE IF EXISTS `jcl_org_hrmresourceext`; CREATE TABLE `jcl_org_hrmresourceext` ( `id` int(11) NOT NULL, `creator` int(11) NULL DEFAULT NULL, @@ -300,7 +286,6 @@ CREATE TABLE `jcl_org_hrmresourceext` ( ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; -DROP TABLE IF EXISTS `jcl_org_hrmresourceext_dt1`; CREATE TABLE `jcl_org_hrmresourceext_dt1` ( `id` int(11) NOT NULL AUTO_INCREMENT, `mainid` int(11) NULL DEFAULT NULL, @@ -312,7 +297,6 @@ CREATE TABLE `jcl_org_hrmresourceext_dt1` ( ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; -DROP TABLE IF EXISTS `jcl_org_job`; CREATE TABLE `jcl_org_job` ( `id` int(11) NOT NULL AUTO_INCREMENT, `job_no` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, @@ -342,7 +326,6 @@ CREATE TABLE `jcl_org_job` ( ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; -DROP TABLE IF EXISTS `jcl_org_jobdt`; CREATE TABLE `jcl_org_jobdt` ( `id` int(11) NOT NULL AUTO_INCREMENT, `mainid` int(11) NULL DEFAULT NULL, @@ -358,7 +341,6 @@ CREATE TABLE `jcl_org_jobdt` ( ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; -DROP TABLE IF EXISTS `jcl_org_jobext`; CREATE TABLE `jcl_org_jobext` ( `id` int(11) NOT NULL AUTO_INCREMENT, `creator` int(11) NULL DEFAULT NULL, @@ -369,7 +351,6 @@ CREATE TABLE `jcl_org_jobext` ( ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; -DROP TABLE IF EXISTS `jcl_org_jobext_dt1`; CREATE TABLE `jcl_org_jobext_dt1` ( `id` int(11) NOT NULL AUTO_INCREMENT, `mainid` int(11) NULL DEFAULT NULL, @@ -385,7 +366,6 @@ CREATE TABLE `jcl_org_jobext_dt1` ( ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; -DROP TABLE IF EXISTS `jcl_org_level`; CREATE TABLE `jcl_org_level` ( `id` int(11) NOT NULL AUTO_INCREMENT, `level_no` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, @@ -402,7 +382,6 @@ CREATE TABLE `jcl_org_level` ( ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; -DROP TABLE IF EXISTS `jcl_org_map`; CREATE TABLE `jcl_org_map` ( `fid` int(11) NOT NULL AUTO_INCREMENT, `id` int(11) NULL DEFAULT NULL, @@ -436,7 +415,6 @@ CREATE TABLE `jcl_org_map` ( ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; -DROP TABLE IF EXISTS `jcl_org_post`; CREATE TABLE `jcl_org_post` ( `id` int(11) NOT NULL AUTO_INCREMENT, `post_name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, @@ -450,7 +428,6 @@ CREATE TABLE `jcl_org_post` ( ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; -DROP TABLE IF EXISTS `jcl_org_post_info`; CREATE TABLE `jcl_org_post_info` ( `id` int(11) NOT NULL AUTO_INCREMENT, `post_info_no` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, @@ -470,7 +447,6 @@ CREATE TABLE `jcl_org_post_info` ( ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; -DROP TABLE IF EXISTS `jcl_org_scheme`; CREATE TABLE `jcl_org_scheme` ( `id` int(11) NOT NULL AUTO_INCREMENT, `scheme_no` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, @@ -486,7 +462,6 @@ CREATE TABLE `jcl_org_scheme` ( ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; -DROP TABLE IF EXISTS `jcl_org_sequence`; CREATE TABLE `jcl_org_sequence` ( `id` int(11) NOT NULL AUTO_INCREMENT, `sequence_no` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, @@ -503,7 +478,6 @@ CREATE TABLE `jcl_org_sequence` ( ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; -DROP TABLE IF EXISTS `jcl_org_staff`; CREATE TABLE `jcl_org_staff` ( `id` int(11) NOT NULL AUTO_INCREMENT, `plan_id` int(11) NULL DEFAULT NULL, @@ -526,7 +500,6 @@ CREATE TABLE `jcl_org_staff` ( ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; -DROP TABLE IF EXISTS `jcl_org_staffplan`; CREATE TABLE `jcl_org_staffplan` ( `id` int(11) NOT NULL AUTO_INCREMENT, `plan_no` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, @@ -547,7 +520,6 @@ CREATE TABLE `jcl_org_staffplan` ( ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; -DROP TABLE IF EXISTS `jcl_org_staffs`; CREATE TABLE `jcl_org_staffs` ( `id` int(11) NOT NULL AUTO_INCREMENT, `staff_id` int(11) NULL DEFAULT NULL, @@ -563,7 +535,6 @@ CREATE TABLE `jcl_org_staffs` ( PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; -DROP TABLE IF EXISTS `jcl_import_history`; CREATE TABLE `jcl_import_history` ( `id` int(11) NOT NULL AUTO_INCREMENT, `operator` int(11) NOT NULL, @@ -577,7 +548,6 @@ CREATE TABLE `jcl_import_history` ( ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; -DROP TABLE IF EXISTS `jcl_import_history_detail`; CREATE TABLE `jcl_import_history_detail` ( `id` int(11) NOT NULL AUTO_INCREMENT, `pid` int(11) NOT NULL, @@ -706,7 +676,6 @@ insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES (99, 4, 'JCL_ORG_HRMRESOURCE', 'work_year', '工龄', 'decimal(15,2)', 1, 4, 1, 0, 1, NULL, 1, 1, 1, 53, 1, 0, now(), NULL, '3', '["input","float","2"]', 0); insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES (100, 4, 'JCL_ORG_HRMRESOURCE', 'company_work_year', '司龄', 'decimal(15,2)', 1, 4, 1, 0, 1, NULL, 1, 1, 1, 54, 1, 0, now(), NULL, '3', '["input","float","2"]', 0); -DROP TABLE IF EXISTS `JCL_INFO`; CREATE TABLE `JCL_INFO` ( `id` int(11) NOT NULL AUTO_INCREMENT, `fname` varchar(100) DEFAULT NULL, diff --git a/docs/脚本/Oracle/表结构、初始化数据Oracle.sql b/docs/脚本/Oracle/表结构、初始化数据Oracle.sql index f68806b4..510e4dd6 100644 --- a/docs/脚本/Oracle/表结构、初始化数据Oracle.sql +++ b/docs/脚本/Oracle/表结构、初始化数据Oracle.sql @@ -1,31 +1,4 @@ -create or replace procedure jcl_droptable( - p_table in varchar2 -) is - v_count number(10); -begin -select count(*) into v_count from user_tables where table_name = upper(p_table); -if v_count > 0 then - execute immediate 'drop table ' || p_table ; -end if; -end jcl_droptable; -/ - -create or replace procedure jcl_dropsequence( - p_sequence in varchar2 -) is - v_count number(10); -begin -select count(*) into v_count from user_sequences where sequence_name = upper(p_sequence); -if v_count > 0 then - execute immediate 'drop sequence ' || p_sequence ; -end if; -end jcl_dropsequence; -/ - -begin - jcl_droptable('JCL_ORG_SCHEME'); -END; -/ + CREATE TABLE JCL_ORG_SCHEME ( ID NUMBER NOT NULL, SCHEME_NO NVARCHAR2(100) NULL, @@ -40,10 +13,7 @@ CREATE TABLE JCL_ORG_SCHEME ( CONSTRAINT JCL_ORG_SCHEME_PK PRIMARY KEY (ID) ) / -begin - jcl_droptable('JCL_ORG_LEVEL'); -END; -/ + CREATE TABLE JCL_ORG_LEVEL ( ID NUMBER NOT NULL, LEVEL_NO NVARCHAR2(100) NULL, @@ -59,10 +29,7 @@ CREATE TABLE JCL_ORG_LEVEL ( CONSTRAINT JCL_ORG_LEVEL_PK PRIMARY KEY (ID) ) / -begin - jcl_droptable('JCL_ORG_GRADE'); -END; -/ + CREATE TABLE JCL_ORG_GRADE ( ID NUMBER NOT NULL, GRADE_NO NVARCHAR2(100) NULL, @@ -80,10 +47,6 @@ CREATE TABLE JCL_ORG_GRADE ( ) / -begin - jcl_droptable('JCL_ORG_SEQUENCE'); -END; -/ CREATE TABLE JCL_ORG_SEQUENCE ( ID NUMBER NOT NULL, SEQUENCE_NO NVARCHAR2(100) NULL, @@ -99,10 +62,7 @@ CREATE TABLE JCL_ORG_SEQUENCE ( CONSTRAINT JCL_ORG_SEQUENCE_PK PRIMARY KEY (ID) ) / -begin - jcl_droptable('JCL_ORG_POST'); -END; -/ + CREATE TABLE JCL_ORG_POST ( ID NUMBER NOT NULL, POST_NO NVARCHAR2(100) NULL, @@ -117,10 +77,7 @@ CREATE TABLE JCL_ORG_POST ( ) / -begin - jcl_droptable('JCL_ORG_POST_INFO'); -END; -/ + CREATE TABLE JCL_ORG_POST_INFO ( ID NUMBER NOT NULL, POST_INFO_NO NVARCHAR2(100) NULL, @@ -140,10 +97,7 @@ CREATE TABLE JCL_ORG_POST_INFO ( ) / -begin - jcl_droptable('JCL_ORG_COMP'); -END; -/ + CREATE TABLE JCL_ORG_COMP ( ID NUMBER NOT NULL, COMP_NO NVARCHAR2(100) NULL, @@ -166,10 +120,7 @@ CREATE TABLE JCL_ORG_COMP ( ) / -begin - jcl_droptable('JCL_FIELD_EXTENDGROUP'); -END; -/ + CREATE TABLE JCL_FIELD_EXTENDGROUP ( ID NUMBER NOT NULL, PID NUMBER NULL, @@ -186,10 +137,7 @@ CREATE TABLE JCL_FIELD_EXTENDGROUP ( ) / -begin - jcl_droptable('JCL_FIELD_EXTENDTITLE'); -END; -/ + CREATE TABLE JCL_FIELD_EXTENDTITLE ( ID NUMBER NOT NULL, GROUP_ID NUMBER NULL, @@ -205,10 +153,7 @@ CREATE TABLE JCL_FIELD_EXTENDTITLE ( ) / -begin - jcl_droptable('JCL_FIELD_EXTENDINFO'); -END; -/ + CREATE TABLE JCL_FIELD_EXTENDINFO ( ID NUMBER NOT NULL, EXTEND_TYPE NUMBER NULL, @@ -237,10 +182,7 @@ CREATE TABLE JCL_FIELD_EXTENDINFO ( ) / -begin - jcl_droptable('JCL_ORG_COMPEXT'); -END; -/ + CREATE TABLE JCL_ORG_COMPEXT ( ID NUMBER NOT NULL, CREATOR NUMBER NULL, @@ -251,10 +193,7 @@ CREATE TABLE JCL_ORG_COMPEXT ( ) / -begin - jcl_droptable('JCL_ORG_COMPEXT_DT1'); -END; -/ + CREATE TABLE JCL_ORG_COMPEXT_DT1 ( ID NUMBER NOT NULL, MAINID NUMBER NULL, @@ -266,10 +205,7 @@ CREATE TABLE JCL_ORG_COMPEXT_DT1 ( ) / -begin - jcl_droptable('JCL_ORG_DEPT'); -END; -/ + CREATE TABLE JCL_ORG_DEPT ( ID NUMBER NOT NULL, DEPT_NO NVARCHAR2(100) NULL, @@ -291,10 +227,7 @@ CREATE TABLE JCL_ORG_DEPT ( ) / -begin - jcl_droptable('JCL_ORG_DEPTEXT'); -END; -/ + CREATE TABLE JCL_ORG_DEPTEXT ( ID NUMBER NOT NULL, CREATOR NUMBER NULL, @@ -305,10 +238,7 @@ CREATE TABLE JCL_ORG_DEPTEXT ( ) / -begin - jcl_droptable('JCL_ORG_DEPTEXT_DT1'); -END; -/ + CREATE TABLE JCL_ORG_DEPTEXT_DT1 ( ID NUMBER NOT NULL, MAINID NUMBER NULL, @@ -320,10 +250,7 @@ CREATE TABLE JCL_ORG_DEPTEXT_DT1 ( ) / -begin - jcl_droptable('JCL_ORG_JOB'); -END; -/ + CREATE TABLE JCL_ORG_JOB ( ID NUMBER NOT NULL, JOB_NO NVARCHAR2(100) NULL, @@ -353,10 +280,7 @@ CREATE TABLE JCL_ORG_JOB ( ) / -begin - jcl_droptable('JCL_ORG_JOBDT'); -END; -/ + CREATE TABLE JCL_ORG_JOBDT ( ID NUMBER NOT NULL, MAINID NUMBER NULL, @@ -372,10 +296,7 @@ CREATE TABLE JCL_ORG_JOBDT ( ) / -begin - jcl_droptable('JCL_ORG_JOBEXT'); -END; -/ + CREATE TABLE JCL_ORG_JOBEXT ( ID NUMBER NOT NULL, CREATOR NUMBER NULL, @@ -386,10 +307,7 @@ CREATE TABLE JCL_ORG_JOBEXT ( ) / -begin - jcl_droptable('JCL_ORG_JOBEXT_DT1'); -END; -/ + CREATE TABLE JCL_ORG_JOBEXT_DT1 ( ID NUMBER NOT NULL, MAINID NUMBER NULL, @@ -405,10 +323,7 @@ CREATE TABLE JCL_ORG_JOBEXT_DT1 ( ) / -begin - jcl_droptable('JCL_ORG_HRMRESOURCE'); -END; -/ + CREATE TABLE JCL_ORG_HRMRESOURCE ( ID NUMBER NOT NULL, WORK_CODE NVARCHAR2(60) NULL, @@ -480,10 +395,7 @@ CREATE TABLE JCL_ORG_HRMRESOURCE ( ) / -begin - jcl_droptable('JCL_ORG_HRMRESOURCEEXT'); -END; -/ + CREATE TABLE JCL_ORG_HRMRESOURCEEXT ( ID NUMBER NOT NULL, CREATOR NUMBER NULL, @@ -494,10 +406,7 @@ CREATE TABLE JCL_ORG_HRMRESOURCEEXT ( ) / -begin - jcl_droptable('JCL_ORG_HRMRESOURCEEXT_DT1'); -END; -/ + CREATE TABLE JCL_ORG_HRMRESOURCEEXT_DT1 ( ID NUMBER NOT NULL, MAINID NUMBER NULL, @@ -509,10 +418,7 @@ CREATE TABLE JCL_ORG_HRMRESOURCEEXT_DT1 ( ) / -begin - jcl_droptable('JCL_ORG_STAFFPLAN'); -END; -/ + CREATE TABLE JCL_ORG_STAFFPLAN ( ID NUMBER NOT NULL, PLAN_NO NVARCHAR2(100) NULL, @@ -533,10 +439,7 @@ CREATE TABLE JCL_ORG_STAFFPLAN ( ) / -begin - jcl_droptable('JCL_ORG_STAFF'); -END; -/ + CREATE TABLE JCL_ORG_STAFF ( ID NUMBER NOT NULL, PLAN_ID NUMBER NULL, @@ -559,10 +462,7 @@ CREATE TABLE JCL_ORG_STAFF ( ) / -begin - jcl_droptable('JCL_ORG_STAFFS'); -END; -/ + CREATE TABLE JCL_ORG_STAFFS ( ID NUMBER NOT NULL, STAFF_ID NUMBER NULL, @@ -578,10 +478,7 @@ CREATE TABLE JCL_ORG_STAFFS ( ) / -begin - jcl_droptable('HR_LOG'); -END; -/ + CREATE TABLE HR_LOG ( ID NUMBER NOT NULL, OPERATE_DESC NVARCHAR2(100) NULL, @@ -602,10 +499,7 @@ CREATE TABLE HR_LOG ( ) / -begin - jcl_droptable('JCL_ORG_HRMRELATION'); -END; -/ + CREATE TABLE JCL_ORG_HRMRELATION ( ID NUMBER NOT NULL, SCHEME_ID NUMBER NULL, @@ -625,10 +519,7 @@ CREATE TABLE JCL_ORG_HRMRELATION ( ) / -begin - jcl_droptable('JCL_ORG_MAP'); -END; -/ + CREATE TABLE JCL_ORG_MAP ( FID NUMBER NOT NULL, ID NUMBER NOT NULL, @@ -662,10 +553,7 @@ CREATE TABLE JCL_ORG_MAP ( ) / -begin - jcl_droptable('JCL_IMPORT_HISTORY'); -END; -/ + CREATE TABLE JCL_IMPORT_HISTORY ( ID NUMBER NOT NULL, OPERATOR NUMBER NOT NULL, @@ -679,10 +567,7 @@ CREATE TABLE JCL_IMPORT_HISTORY ( ) / -begin - jcl_droptable('JCL_IMPORT_HISTORY_DETAIL'); -END; -/ + CREATE TABLE JCL_IMPORT_HISTORY_DETAIL ( ID NUMBER NOT NULL , PID NUMBER NOT NULL, @@ -694,10 +579,7 @@ CREATE TABLE JCL_IMPORT_HISTORY_DETAIL ( ) / -begin - jcl_droptable('JCL_INFO'); -END; -/ + CREATE TABLE JCL_INFO ( ID NUMBER NOT NULL, FNAME NVARCHAR2(100) DEFAULT NULL, @@ -706,10 +588,7 @@ CREATE TABLE JCL_INFO ( ) / -BEGIN - jcl_dropsequence('JCL_ORG_SCHEME_ID'); -END; -/ + CREATE SEQUENCE JCL_ORG_SCHEME_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE / CREATE @@ -723,10 +602,7 @@ END; / -BEGIN - jcl_dropsequence('JCL_ORG_LEVEL_ID'); -END; -/ + CREATE SEQUENCE JCL_ORG_LEVEL_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE / CREATE @@ -740,10 +616,7 @@ END; / -BEGIN - jcl_dropsequence('JCL_ORG_GRADE_ID'); -END; -/ + CREATE SEQUENCE JCL_ORG_GRADE_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE / CREATE @@ -758,10 +631,7 @@ END; -BEGIN - jcl_dropsequence('JCL_ORG_SEQUENCE_ID'); -END; -/ + CREATE SEQUENCE JCL_ORG_SEQUENCE_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE / CREATE @@ -776,10 +646,7 @@ END; -BEGIN - jcl_dropsequence('JCL_ORG_POST_ID'); -END; -/ + CREATE SEQUENCE JCL_ORG_POST_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE / CREATE @@ -794,10 +661,7 @@ END; -BEGIN - jcl_dropsequence('JCL_ORG_POST_INFO_ID'); -END; -/ + CREATE SEQUENCE JCL_ORG_POST_INFO_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE / CREATE @@ -812,10 +676,7 @@ END; -BEGIN - jcl_dropsequence('JCL_ORG_COMP_ID'); -END; -/ + CREATE SEQUENCE JCL_ORG_COMP_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE / CREATE @@ -830,10 +691,7 @@ END; -BEGIN - jcl_dropsequence('JCL_FIELD_GROUP_ID'); -END; -/ + CREATE SEQUENCE JCL_FIELD_GROUP_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE / CREATE @@ -848,10 +706,7 @@ END; -BEGIN - jcl_dropsequence('JCL_FIELD_TITLE_ID'); -END; -/ + CREATE SEQUENCE JCL_FIELD_TITLE_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE / CREATE @@ -866,10 +721,7 @@ END; -BEGIN - jcl_dropsequence('JCL_FIELD_INFO_ID'); -END; -/ + CREATE SEQUENCE JCL_FIELD_INFO_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE / CREATE @@ -884,10 +736,7 @@ END; -BEGIN - jcl_dropsequence('JCL_ORG_COMPEXT_DT1_ID'); -END; -/ + CREATE SEQUENCE JCL_ORG_COMPEXT_DT1_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE / CREATE @@ -902,10 +751,7 @@ END; -BEGIN - jcl_dropsequence('JCL_ORG_DEPT_ID'); -END; -/ + CREATE SEQUENCE JCL_ORG_DEPT_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE / CREATE @@ -920,10 +766,7 @@ END; -BEGIN - jcl_dropsequence('JCL_ORG_DEPTEXT_DT1_ID'); -END; -/ + CREATE SEQUENCE JCL_ORG_DEPTEXT_DT1_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE / CREATE @@ -938,10 +781,7 @@ END; -BEGIN - jcl_dropsequence('JCL_ORG_JOB_ID'); -END; -/ + CREATE SEQUENCE JCL_ORG_JOB_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE / CREATE @@ -956,10 +796,7 @@ END; -BEGIN - jcl_dropsequence('JCL_ORG_JOBDT_ID'); -END; -/ + CREATE SEQUENCE JCL_ORG_JOBDT_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE / CREATE @@ -974,10 +811,7 @@ END; -BEGIN - jcl_dropsequence('JCL_ORG_JOBEXT_DT1_ID'); -END; -/ + CREATE SEQUENCE JCL_ORG_JOBEXT_DT1_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE / CREATE @@ -992,10 +826,7 @@ END; -BEGIN - jcl_dropsequence('JCL_ORG_HRM_ID'); -END; -/ + CREATE SEQUENCE JCL_ORG_HRM_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE / CREATE @@ -1010,10 +841,7 @@ END; -BEGIN - jcl_dropsequence('JCL_ORG_HRMEXT_DT1_ID'); -END; -/ + CREATE SEQUENCE JCL_ORG_HRMEXT_DT1_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE / CREATE @@ -1028,10 +856,7 @@ END; -BEGIN - jcl_dropsequence('JCL_ORG_STAFFPLAN_ID'); -END; -/ + CREATE SEQUENCE JCL_ORG_STAFFPLAN_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE / CREATE @@ -1047,10 +872,7 @@ END; -BEGIN - jcl_dropsequence('JCL_ORG_STAFF_ID'); -END; -/ + CREATE SEQUENCE JCL_ORG_STAFF_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE / CREATE @@ -1065,10 +887,7 @@ END; -BEGIN - jcl_dropsequence('JCL_ORG_STAFFS_ID'); -END; -/ + CREATE SEQUENCE JCL_ORG_STAFFS_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE / CREATE @@ -1083,10 +902,7 @@ END; -BEGIN - jcl_dropsequence('JCL_ORG_MAP_FID'); -END; -/ + CREATE SEQUENCE JCL_ORG_MAP_FID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE / CREATE @@ -1101,10 +917,7 @@ END; -BEGIN - jcl_dropsequence('HR_LOG_ID'); -END; -/ + CREATE SEQUENCE HR_LOG_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE / CREATE @@ -1119,10 +932,7 @@ END; -BEGIN - jcl_dropsequence('JCL_IMPORT_HISTORY_ID'); -END; -/ + CREATE SEQUENCE JCL_IMPORT_HISTORY_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE / CREATE @@ -1137,10 +947,7 @@ END; -BEGIN - jcl_dropsequence('JCL_IMPORT_DETAIL_ID'); -END; -/ + CREATE SEQUENCE JCL_IMPORT_DETAIL_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE / CREATE @@ -1155,10 +962,7 @@ END; -BEGIN - jcl_dropsequence('JCL_INFO_ID'); -END; -/ + CREATE SEQUENCE JCL_INFO_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE / CREATE diff --git a/docs/脚本/SqlServer/表结构、基础数据.sql b/docs/脚本/SqlServer/表结构、基础数据.sql index 5e411e84..df806b9b 100644 --- a/docs/脚本/SqlServer/表结构、基础数据.sql +++ b/docs/脚本/SqlServer/表结构、基础数据.sql @@ -1057,9 +1057,7 @@ GO set IDENTITY_INSERT JCL_FIELD_EXTENDINFO OFF GO -IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[jcl_info]') AND type IN ('U')) - DROP TABLE [dbo].[jcl_info] -GO + CREATE TABLE [dbo].[jcl_info] ( [id] int NOT NULL, From 989526bc26e7514afd71a33c31b0be97901dd24c Mon Sep 17 00:00:00 2001 From: dxfeng Date: Fri, 2 Sep 2022 17:31:44 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=8A=B6=E6=80=81BUG?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/util/RefreshIsUsedUtil.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/com/engine/organization/util/RefreshIsUsedUtil.java b/src/com/engine/organization/util/RefreshIsUsedUtil.java index 74bfdc56..7786d2be 100644 --- a/src/com/engine/organization/util/RefreshIsUsedUtil.java +++ b/src/com/engine/organization/util/RefreshIsUsedUtil.java @@ -10,6 +10,7 @@ import com.engine.organization.mapper.staff.StaffMapper; import com.engine.organization.mapper.staff.StaffPlanMapper; import com.engine.organization.util.db.MapperProxyFactory; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang.StringUtils; import java.util.Arrays; import java.util.List; @@ -47,7 +48,7 @@ public class RefreshIsUsedUtil { */ public static void RefreshLevel(String tableName) { List usedIds = MapperProxyFactory.getProxy(LevelMapper.class).listUsedId(); - usedIds.removeIf(Objects::isNull); + usedIds.removeIf(StringUtils::isBlank); RefreshIsUsedStatus(tableName, usedIds); } @@ -58,7 +59,8 @@ public class RefreshIsUsedUtil { */ public static void RefreshGrade(String tableName) { List usedIds = MapperProxyFactory.getProxy(GradeMapper.class).listUsedId(); - usedIds.removeIf(Objects::isNull); + //usedIds.forEach(System.out ::println); + usedIds.removeIf(StringUtils::isBlank); RefreshIsUsedStatus(tableName, usedIds); } @@ -69,7 +71,7 @@ public class RefreshIsUsedUtil { */ public static void RefreshSequence(String tableName) { List usedIds = MapperProxyFactory.getProxy(SequenceMapper.class).listUsedId(); - usedIds.removeIf(Objects::isNull); + usedIds.removeIf(StringUtils::isBlank); RefreshIsUsedStatus(tableName, usedIds); } @@ -80,7 +82,7 @@ public class RefreshIsUsedUtil { */ public static void RefreshStaffPlan(String tableName) { List usedIds = MapperProxyFactory.getProxy(StaffPlanMapper.class).listUsedId(); - usedIds.removeIf(Objects::isNull); + usedIds.removeIf(StringUtils::isBlank); RefreshIsUsedStatus(tableName, usedIds); } @@ -91,7 +93,7 @@ public class RefreshIsUsedUtil { */ public static void RefreshStaff(String tableName) { List usedIds = MapperProxyFactory.getProxy(StaffMapper.class).listUsedId(); - usedIds.removeIf(Objects::isNull); + usedIds.removeIf(StringUtils::isBlank); RefreshIsUsedStatus(tableName, usedIds); } @@ -103,7 +105,7 @@ public class RefreshIsUsedUtil { */ public static void RefreshPostInfo(String tableName) { List usedIds = MapperProxyFactory.getProxy(PostInfoMapper.class).listUsedId(); - usedIds.removeIf(Objects::isNull); + usedIds.removeIf(StringUtils::isBlank); RefreshIsUsedStatus(tableName, usedIds); } @@ -118,7 +120,7 @@ public class RefreshIsUsedUtil { List collect = Arrays.stream(String.join(",", usedIds).split(",")).collect(Collectors.toList()); getRefreshUseMapper().updateIsUsedByIds(tableName, collect, 0); getRefreshUseMapper().updateIsUsedByIds(tableName, collect, 1); - }else{ + } else { getRefreshUseMapper().initIsUseStatus(tableName); } }