liang.cheng
/
weaver-hrm-organization
2
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BUG修复

Browse Source
pull/194/MERGE^2
dxfeng 3 years ago
parent 7ad378bedd
commit e0b09bde52
3 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File

5
docs/脚本/SqlServer/浏览按钮sqlserver.sql
Unescape Escape View File

@ -164,7 +164,8 @@ INSERT INTO WORKFLOW_BROWSERURL(ID, LABELID, FIELDDBTYPE, BROWSERURL, TABLENAME,
INSERT INTO WORKFLOW_BROWSERURL_MODULE(BROWSERID,MODULECODE)VALUES('666','workflow') INSERT INTO WORKFLOW_BROWSERURL_MODULE(BROWSERID,MODULECODE)VALUES('666','workflow')
GO 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 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 GO

34
docs/脚本/SqlServer/表结构、基础数据.sql
Unescape Escape View File

@ -62,7 +62,7 @@ CREATE TABLE [dbo].[JCL_FIELD_EXTENDINFO] (
[field_name_desc] varchar(100) COLLATE Chinese_PRC_CI_AS NULL, [field_name_desc] varchar(100) COLLATE Chinese_PRC_CI_AS NULL,
[field_type] varchar(1000) COLLATE Chinese_PRC_CI_AS NULL, [field_type] varchar(1000) COLLATE Chinese_PRC_CI_AS NULL,
[control_type] int 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, [browser_type] varchar(100) COLLATE Chinese_PRC_CI_AS NULL,
[extend_group_id] int NULL, [extend_group_id] int NULL,
[isenable] 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, [org_code] varchar(100) COLLATE Chinese_PRC_CI_AS NULL,
[industry] int NULL, [industry] int NULL,
[comp_principal] 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, [forbidden_tag] int NULL,
[show_order] int NULL, [show_order] int NULL,
[is_used] int NULL, [is_used] int NULL,
@ -189,7 +189,7 @@ CREATE TABLE [dbo].[JCL_ORG_DEPT] (
[parent_dept] int NULL, [parent_dept] int NULL,
[dept_principal] int NULL, [dept_principal] int NULL,
[show_order] 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, [forbidden_tag] int NULL,
[is_used] int NULL, [is_used] int NULL,
[creator] int NULL, [creator] int NULL,
@ -250,7 +250,7 @@ CREATE TABLE [dbo].[JCL_ORG_GRADE] (
[id] int IDENTITY(1,1) NOT NULL, [id] int IDENTITY(1,1) NOT NULL,
[grade_no] varchar(100) COLLATE Chinese_PRC_CI_AS NULL, [grade_no] varchar(100) COLLATE Chinese_PRC_CI_AS NULL,
[grade_name] 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, [scheme_id] int NULL,
[level_id] varchar(100) COLLATE Chinese_PRC_CI_AS NULL, [level_id] varchar(100) COLLATE Chinese_PRC_CI_AS NULL,
[forbidden_tag] int NULL, [forbidden_tag] int NULL,
@ -427,9 +427,9 @@ CREATE TABLE [dbo].[JCL_ORG_JOB] (
[parent_job] int NULL, [parent_job] int NULL,
[is_key] int NULL, [is_key] int NULL,
[workplace] varchar(100) COLLATE Chinese_PRC_CI_AS NULL, [workplace] 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,
[work_duty] text COLLATE Chinese_PRC_CI_AS NULL, [work_duty] varchar(1000) COLLATE Chinese_PRC_CI_AS NULL,
[work_authority] text COLLATE Chinese_PRC_CI_AS NULL, [work_authority] varchar(1000) COLLATE Chinese_PRC_CI_AS NULL,
[forbidden_tag] int NULL, [forbidden_tag] int NULL,
[show_order] int NULL, [show_order] int NULL,
[grade_id] varchar(100) COLLATE Chinese_PRC_CI_AS 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, [id] int IDENTITY(1,1) NOT NULL,
[level_no] varchar(100) COLLATE Chinese_PRC_CI_AS NULL, [level_no] varchar(100) COLLATE Chinese_PRC_CI_AS NULL,
[level_name] 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, [scheme_id] int NULL,
[forbidden_tag] int NULL, [forbidden_tag] int NULL,
[is_used] int NULL, [is_used] int NULL,
@ -543,7 +543,7 @@ CREATE TABLE [dbo].[JCL_ORG_POST] (
[id] int IDENTITY(1,1) NOT NULL, [id] int IDENTITY(1,1) NOT NULL,
[post_no] varchar(100) COLLATE Chinese_PRC_CI_AS NULL, [post_no] varchar(100) COLLATE Chinese_PRC_CI_AS NULL,
[post_name] 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, [is_used] int NULL,
[creator] int NULL, [creator] int NULL,
[delete_type] int NULL, [delete_type] int NULL,
@ -565,11 +565,11 @@ CREATE TABLE [dbo].[JCL_ORG_POST_INFO] (
[id] int IDENTITY(1,1) NOT NULL, [id] int IDENTITY(1,1) NOT NULL,
[post_info_no] varchar(100) COLLATE Chinese_PRC_CI_AS 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_name] varchar(100) COLLATE Chinese_PRC_CI_AS NULL,
[post_info_authority] text COLLATE Chinese_PRC_CI_AS NULL, [post_info_authority] varchar(1000) COLLATE Chinese_PRC_CI_AS NULL,
[post_info_duty] text COLLATE Chinese_PRC_CI_AS NULL, [post_info_duty] varchar(1000) COLLATE Chinese_PRC_CI_AS NULL,
[post_info_qualification] text COLLATE Chinese_PRC_CI_AS NULL, [post_info_qualification] varchar(1000) COLLATE Chinese_PRC_CI_AS NULL,
[post_id] int 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, [forbidden_tag] int NULL,
[is_used] int NULL, [is_used] int NULL,
[creator] int NULL, [creator] int NULL,
@ -592,7 +592,7 @@ CREATE TABLE [dbo].[JCL_ORG_SCHEME] (
[id] int IDENTITY(1,1) NOT NULL, [id] int IDENTITY(1,1) NOT NULL,
[scheme_no] varchar(100) COLLATE Chinese_PRC_CI_AS NULL, [scheme_no] varchar(100) COLLATE Chinese_PRC_CI_AS NULL,
[scheme_name] 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, [forbidden_tag] int NULL,
[is_used] int NULL, [is_used] int NULL,
[creator] int NULL, [creator] int NULL,
@ -615,7 +615,7 @@ CREATE TABLE [dbo].[JCL_ORG_SEQUENCE] (
[id] int IDENTITY(1,1) NOT NULL, [id] int IDENTITY(1,1) NOT NULL,
[sequence_no] varchar(100) COLLATE Chinese_PRC_CI_AS NULL, [sequence_no] varchar(100) COLLATE Chinese_PRC_CI_AS NULL,
[sequence_name] 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, [scheme_id] int NULL,
[forbidden_tag] int NULL, [forbidden_tag] int NULL,
[is_used] int NULL, [is_used] int NULL,
@ -647,7 +647,7 @@ CREATE TABLE [dbo].[JCL_ORG_STAFF] (
[freeze_num] int NULL, [freeze_num] int NULL,
[lack_status] int NULL, [lack_status] int NULL,
[staff_desc] varchar(100) COLLATE Chinese_PRC_CI_AS 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, [is_used] int NULL,
[creator] int NULL, [creator] int NULL,
[delete_type] int NULL, [delete_type] int NULL,
@ -674,7 +674,7 @@ CREATE TABLE [dbo].[JCL_ORG_STAFFPLAN] (
[time_end] datetime NULL, [time_end] datetime NULL,
[company_id] varchar(100) COLLATE Chinese_PRC_CI_AS NULL, [company_id] varchar(100) COLLATE Chinese_PRC_CI_AS NULL,
[control_dimension] varchar(5) 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, [forbidden_tag] int NULL,
[is_used] int NULL, [is_used] int NULL,
[creator] int NULL, [creator] int NULL,

3
src/com/engine/organization/service/impl/DepartmentServiceImpl.java
Unescape Escape View File

@ -506,8 +506,11 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
deptById.setParentComp(company); deptById.setParentComp(company);
deptById.setParentDept(null); deptById.setParentDept(null);
} else if ("1".equals(moveParam.getMoveType())) { } else if ("1".equals(moveParam.getMoveType())) {
// TODO 判断是否选择子部门
Long department = moveParam.getDepartment(); Long department = moveParam.getDepartment();
OrganizationAssert.notNull(department, "请选择要转移到的部门"); OrganizationAssert.notNull(department, "请选择要转移到的部门");
getDepartmentMapper().getDeptListByPId(moveParam.getId());
deptById.setParentDept(department); deptById.setParentDept(department);
DepartmentPO parentDepartment = getDepartmentMapper().getDeptById(department); DepartmentPO parentDepartment = getDepartmentMapper().getDeptById(department);
deptById.setParentComp(parentDepartment.getParentComp()); deptById.setParentComp(parentDepartment.getParentComp());

Write Preview
Loading…
Cancel
Save