From e0b09bde52b35572ca44449f5c6a09095fb254e0 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Fri, 12 Aug 2022 16:35:53 +0800 Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/脚本/SqlServer/浏览按钮sqlserver.sql | 5 +-- docs/脚本/SqlServer/表结构、基础数据.sql | 34 +++++++++---------- .../service/impl/DepartmentServiceImpl.java | 3 ++ 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/docs/脚本/SqlServer/浏览按钮sqlserver.sql b/docs/脚本/SqlServer/浏览按钮sqlserver.sql index 5b2c7790..7ccf88ad 100644 --- a/docs/脚本/SqlServer/浏览按钮sqlserver.sql +++ b/docs/脚本/SqlServer/浏览按钮sqlserver.sql @@ -164,7 +164,8 @@ INSERT INTO WORKFLOW_BROWSERURL(ID, LABELID, FIELDDBTYPE, BROWSERURL, TABLENAME, INSERT INTO WORKFLOW_BROWSERURL_MODULE(BROWSERID,MODULECODE)VALUES('666','workflow') GO - +declare @hrmjobgroups_id int INSERT INTO HRMJOBGROUPS ( JOBGROUPNAME, JOBGROUPREMARK, created, creater, modified, modifier, uuid ) VALUES ( '聚才林', '聚才林', getDate(), 1, NULL, NULL, 'd9f435c3-8d4d-4e01-9a97-d72f9c5d5fae' ) -INSERT INTO HRMJOBACTIVITIES ( JOBACTIVITYMARK, JOBACTIVITYNAME, JOBGROUPID, JOBLEVELFROM, JOBLEVELTO, created, creater, modified, modifier, uuid ) VALUES ( '默认职务', '默认职务', 14, NULL, NULL,getDate(), 1, NULL, NULL, '3a2efce3-95de-4ec2-afe1-347783817bdb' ) +select @hrmjobgroups_id = max(id) from HRMJOBGROUPS +INSERT INTO HRMJOBACTIVITIES ( JOBACTIVITYMARK, JOBACTIVITYNAME, JOBGROUPID, JOBLEVELFROM, JOBLEVELTO, created, creater, modified, modifier, uuid ) VALUES ( '默认职务', '默认职务', @hrmjobgroups_id, NULL, NULL,getDate(), 1, NULL, NULL, '3a2efce3-95de-4ec2-afe1-347783817bdb' ) GO \ No newline at end of file diff --git a/docs/脚本/SqlServer/表结构、基础数据.sql b/docs/脚本/SqlServer/表结构、基础数据.sql index 4f829154..9df81241 100644 --- a/docs/脚本/SqlServer/表结构、基础数据.sql +++ b/docs/脚本/SqlServer/表结构、基础数据.sql @@ -62,7 +62,7 @@ CREATE TABLE [dbo].[JCL_FIELD_EXTENDINFO] ( [field_name_desc] varchar(100) COLLATE Chinese_PRC_CI_AS NULL, [field_type] varchar(1000) COLLATE Chinese_PRC_CI_AS NULL, [control_type] int NULL, - [custom_value] text COLLATE Chinese_PRC_CI_AS NULL, + [custom_value] varchar(1000) COLLATE Chinese_PRC_CI_AS NULL, [browser_type] varchar(100) COLLATE Chinese_PRC_CI_AS NULL, [extend_group_id] int NULL, [isenable] int NULL, @@ -122,7 +122,7 @@ CREATE TABLE [dbo].[JCL_ORG_COMP] ( [org_code] varchar(100) COLLATE Chinese_PRC_CI_AS NULL, [industry] int NULL, [comp_principal] int NULL, - [description] text COLLATE Chinese_PRC_CI_AS NULL, + [description] varchar(1000) COLLATE Chinese_PRC_CI_AS NULL, [forbidden_tag] int NULL, [show_order] int NULL, [is_used] int NULL, @@ -189,7 +189,7 @@ CREATE TABLE [dbo].[JCL_ORG_DEPT] ( [parent_dept] int NULL, [dept_principal] int NULL, [show_order] int NULL, - [description] text COLLATE Chinese_PRC_CI_AS NULL, + [description] varchar(1000) COLLATE Chinese_PRC_CI_AS NULL, [forbidden_tag] int NULL, [is_used] int NULL, [creator] int NULL, @@ -250,7 +250,7 @@ CREATE TABLE [dbo].[JCL_ORG_GRADE] ( [id] int IDENTITY(1,1) NOT NULL, [grade_no] varchar(100) COLLATE Chinese_PRC_CI_AS NULL, [grade_name] varchar(100) COLLATE Chinese_PRC_CI_AS NULL, - [description] text COLLATE Chinese_PRC_CI_AS NULL, + [description] varchar(1000) COLLATE Chinese_PRC_CI_AS NULL, [scheme_id] int NULL, [level_id] varchar(100) COLLATE Chinese_PRC_CI_AS NULL, [forbidden_tag] int NULL, @@ -427,9 +427,9 @@ CREATE TABLE [dbo].[JCL_ORG_JOB] ( [parent_job] int NULL, [is_key] int NULL, [workplace] varchar(100) COLLATE Chinese_PRC_CI_AS NULL, - [description] text COLLATE Chinese_PRC_CI_AS NULL, - [work_duty] text COLLATE Chinese_PRC_CI_AS NULL, - [work_authority] text COLLATE Chinese_PRC_CI_AS NULL, + [description] varchar(1000) COLLATE Chinese_PRC_CI_AS NULL, + [work_duty] varchar(1000) COLLATE Chinese_PRC_CI_AS NULL, + [work_authority] varchar(1000) COLLATE Chinese_PRC_CI_AS NULL, [forbidden_tag] int NULL, [show_order] int NULL, [grade_id] varchar(100) COLLATE Chinese_PRC_CI_AS NULL, @@ -519,7 +519,7 @@ CREATE TABLE [dbo].[JCL_ORG_LEVEL] ( [id] int IDENTITY(1,1) NOT NULL, [level_no] varchar(100) COLLATE Chinese_PRC_CI_AS NULL, [level_name] varchar(100) COLLATE Chinese_PRC_CI_AS NULL, - [description] text COLLATE Chinese_PRC_CI_AS NULL, + [description] varchar(1000) COLLATE Chinese_PRC_CI_AS NULL, [scheme_id] int NULL, [forbidden_tag] int NULL, [is_used] int NULL, @@ -543,7 +543,7 @@ CREATE TABLE [dbo].[JCL_ORG_POST] ( [id] int IDENTITY(1,1) NOT NULL, [post_no] varchar(100) COLLATE Chinese_PRC_CI_AS NULL, [post_name] varchar(100) COLLATE Chinese_PRC_CI_AS NULL, - [description] text COLLATE Chinese_PRC_CI_AS NULL, + [description] varchar(1000) COLLATE Chinese_PRC_CI_AS NULL, [is_used] int NULL, [creator] int NULL, [delete_type] int NULL, @@ -565,11 +565,11 @@ CREATE TABLE [dbo].[JCL_ORG_POST_INFO] ( [id] int IDENTITY(1,1) NOT NULL, [post_info_no] varchar(100) COLLATE Chinese_PRC_CI_AS NULL, [post_info_name] varchar(100) COLLATE Chinese_PRC_CI_AS NULL, - [post_info_authority] text COLLATE Chinese_PRC_CI_AS NULL, - [post_info_duty] text COLLATE Chinese_PRC_CI_AS NULL, - [post_info_qualification] text COLLATE Chinese_PRC_CI_AS NULL, + [post_info_authority] varchar(1000) COLLATE Chinese_PRC_CI_AS NULL, + [post_info_duty] varchar(1000) COLLATE Chinese_PRC_CI_AS NULL, + [post_info_qualification] varchar(1000) COLLATE Chinese_PRC_CI_AS NULL, [post_id] int NULL, - [description] text COLLATE Chinese_PRC_CI_AS NULL, + [description] varchar(1000) COLLATE Chinese_PRC_CI_AS NULL, [forbidden_tag] int NULL, [is_used] int NULL, [creator] int NULL, @@ -592,7 +592,7 @@ CREATE TABLE [dbo].[JCL_ORG_SCHEME] ( [id] int IDENTITY(1,1) NOT NULL, [scheme_no] varchar(100) COLLATE Chinese_PRC_CI_AS NULL, [scheme_name] varchar(100) COLLATE Chinese_PRC_CI_AS NULL, - [scheme_description] text COLLATE Chinese_PRC_CI_AS NULL, + [scheme_description] varchar(1000) COLLATE Chinese_PRC_CI_AS NULL, [forbidden_tag] int NULL, [is_used] int NULL, [creator] int NULL, @@ -615,7 +615,7 @@ CREATE TABLE [dbo].[JCL_ORG_SEQUENCE] ( [id] int IDENTITY(1,1) NOT NULL, [sequence_no] varchar(100) COLLATE Chinese_PRC_CI_AS NULL, [sequence_name] varchar(100) COLLATE Chinese_PRC_CI_AS NULL, - [description] text COLLATE Chinese_PRC_CI_AS NULL, + [description] varchar(1000) COLLATE Chinese_PRC_CI_AS NULL, [scheme_id] int NULL, [forbidden_tag] int NULL, [is_used] int NULL, @@ -647,7 +647,7 @@ CREATE TABLE [dbo].[JCL_ORG_STAFF] ( [freeze_num] int NULL, [lack_status] int NULL, [staff_desc] varchar(100) COLLATE Chinese_PRC_CI_AS NULL, - [description] text COLLATE Chinese_PRC_CI_AS NULL, + [description] varchar(1000) COLLATE Chinese_PRC_CI_AS NULL, [is_used] int NULL, [creator] int NULL, [delete_type] int NULL, @@ -674,7 +674,7 @@ CREATE TABLE [dbo].[JCL_ORG_STAFFPLAN] ( [time_end] datetime NULL, [company_id] varchar(100) COLLATE Chinese_PRC_CI_AS NULL, [control_dimension] varchar(5) COLLATE Chinese_PRC_CI_AS NULL, - [description] text COLLATE Chinese_PRC_CI_AS NULL, + [description] varchar(1000) COLLATE Chinese_PRC_CI_AS NULL, [forbidden_tag] int NULL, [is_used] int NULL, [creator] int NULL, diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java index 141b0e2e..27badb23 100644 --- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java +++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java @@ -506,8 +506,11 @@ public class DepartmentServiceImpl extends Service implements DepartmentService deptById.setParentComp(company); deptById.setParentDept(null); } else if ("1".equals(moveParam.getMoveType())) { + // TODO 判断是否选择子部门 Long department = moveParam.getDepartment(); OrganizationAssert.notNull(department, "请选择要转移到的部门"); + getDepartmentMapper().getDeptListByPId(moveParam.getId()); + deptById.setParentDept(department); DepartmentPO parentDepartment = getDepartmentMapper().getDeptById(department); deptById.setParentComp(parentDepartment.getParentComp());