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

Merge pull request '组织架构图相关BUG修复' (#28) from feature/dxf into develop

Browse Source 
Reviewed-on: #28
pull/30/head
dxfeng 3 years ago
parent 19f3907807 3989161281
commit 2d40f6be3b
8 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File

4
src/com/engine/organization/entity/hrmresource/po/HrmResourcePO.java
Unescape Escape View File

@ -140,9 +140,9 @@ public class HrmResourcePO {
private String jobGrade;
private Integer schemeId;
private String schemeId;
private Integer sequenceId;
private String sequenceId;
private String baseFieldsValue;

2
src/com/engine/organization/service/impl/GroupServiceImpl.java
Unescape Escape View File

@ -83,7 +83,7 @@ public class GroupServiceImpl extends Service implements GroupService {
String companyweb = (String) params.get("companyweb");
RecordSet rs = new RecordSet();
boolean executeUpdate = rs.executeUpdate("update HrmCompany set COMPANYNAME = ?,COMPANYDESC=?,COMPANYWEB=? where id = ?", companyname, companydesc, companyweb, id);
new Thread(new GroupTriggerRunnable(params)).start();
new GroupTriggerRunnable(params).run();
return executeUpdate;
}

12
src/com/engine/organization/service/impl/ImportCommonServiceImpl.java
Unescape Escape View File

@ -681,7 +681,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
ExtendInfoParams infoParams = ExtendInfoParams.builder().tableName("JCL_ORG_COMP").params(map).build();
MapperProxyFactory.getProxy(ExtMapper.class).insertTable(infoParams);
// 刷新组织架构图
new Thread(new CompanyTriggerRunnable(infoParams.getId())).start();
new CompanyTriggerRunnable(infoParams.getId()).run();
historyDetailPO.setOperateDetail("添加成功");
historyDetailPO.setStatus("1");
} else {
@ -706,7 +706,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
map.remove("id");
MapperProxyFactory.getProxy(ExtMapper.class).updateTable(ExtendInfoParams.builder().id(companyId).tableName("JCL_ORG_COMP").params(map).build());
// 刷新组织架构图
new Thread(new CompanyTriggerRunnable(companyId)).start();
new CompanyTriggerRunnable(companyId).run();
historyDetailPO.setOperateDetail("更新成功");
historyDetailPO.setStatus("1");
} else {
@ -897,7 +897,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
ExtendInfoParams infoParams = ExtendInfoParams.builder().tableName("JCL_ORG_DEPT").params(map).build();
MapperProxyFactory.getProxy(ExtMapper.class).insertTable(infoParams);
// 刷新组织架构图
new Thread(new DepartmentTriggerRunnable(infoParams.getId())).start();
new DepartmentTriggerRunnable(infoParams.getId()).run();
map.put("id", infoParams.getId());
historyDetailPO.setOperateDetail("添加成功");
historyDetailPO.setStatus("1");
@ -923,7 +923,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
map.remove("id");
MapperProxyFactory.getProxy(ExtMapper.class).updateTable(ExtendInfoParams.builder().id(departmentId).tableName("JCL_ORG_DEPT").params(map).build());
// 刷新组织架构图
new Thread(new DepartmentTriggerRunnable(departmentId)).start();
new DepartmentTriggerRunnable(departmentId).run();
historyDetailPO.setOperateDetail("更新成功");
historyDetailPO.setStatus("1");
} else {
@ -1139,7 +1139,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
map.remove("jobactivityid");
MapperProxyFactory.getProxy(ExtMapper.class).insertTable(infoParams);
// 更新组织架构图
new Thread(new JobTriggerRunnable(infoParams.getId())).start();
new JobTriggerRunnable(infoParams.getId()).run();
historyDetailPO.setOperateDetail("添加成功");
historyDetailPO.setStatus("1");
} else {
@ -1172,7 +1172,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
map.remove("jobactivityid");
MapperProxyFactory.getProxy(ExtMapper.class).updateTable(ExtendInfoParams.builder().id(jobId).tableName("JCL_ORG_JOB").params(map).build());
// 更新组织架构图
new Thread(new JobTriggerRunnable(jobId)).start();
new JobTriggerRunnable(jobId).run();
historyDetailPO.setOperateDetail("更新成功");
historyDetailPO.setStatus("1");
} else {

10
src/com/engine/organization/service/impl/JobServiceImpl.java
Unescape Escape View File

@ -472,7 +472,7 @@ public class JobServiceImpl extends Service implements JobService {
assertNameRepeat(null, jobById.getEcDepartment(), jobById.getParentJob(), jobById.getJobName());
insertCount += getJobMapper().insertIgnoreNull(jobById);
// 更新组织架构图
new Thread(new JobTriggerRunnable(jobById.getId())).start();
new JobTriggerRunnable(jobById.getId()).run();
}
return insertCount;
@ -587,12 +587,12 @@ public class JobServiceImpl extends Service implements JobService {
targetJob.setJobName(mergeParam.getMergeName());
getJobMapper().updateBaseJob(targetJob);
new Thread(new JobTriggerRunnable(jobById.getId(),targetJob.getId())).start();
new JobTriggerRunnable(jobById.getId(),targetJob.getId()).run();
// 原岗位删除
new OrganizationSyncEc(user, LogModuleNameEnum.JOB, OperateTypeEnum.CANCELED, null, jobById).sync();
getJobMapper().deleteByIds(Collections.singletonList(jobById.getId()));
// 更新组织架构图
new Thread(new JobTriggerRunnable(jobById)).start();
new JobTriggerRunnable(jobById).run();
return updateCount;
}
@ -608,7 +608,7 @@ public class JobServiceImpl extends Service implements JobService {
// 更新人员信息
updateResourceJob(job);
// 更新组织架构图
new Thread(new JobTriggerRunnable(job.getId())).start();
new JobTriggerRunnable(job.getId()).run();
// 递归处理子级元素
List<JobPO> jobsByPid = getJobMapper().getJobsByPid(job.getId());
@ -787,7 +787,7 @@ public class JobServiceImpl extends Service implements JobService {
new OrganizationSyncEc(user, LogModuleNameEnum.JOB, OperateTypeEnum.CANCELED, null, job).sync();
getJobMapper().updateBaseJob(job);
// 更新组织架构图
new Thread(new JobTriggerRunnable(job.getId())).start();
new JobTriggerRunnable(job.getId()).run();
List<JobPO> childJobs = getJobMapper().getJobsByPid(job.getId());
forbiddenChildTag(parentComp, parentDept, job.getId(), childJobs);
}

6
src/com/engine/organization/service/impl/StaffServiceImpl.java
Unescape Escape View File

@ -147,7 +147,7 @@ public class StaffServiceImpl extends Service implements StaffService {
}
int ignoreNull = getStaffMapper().insertIgnoreNull(staffPO);
// 同步组织架构图编制信息
new Thread(new StaffTriggerRunnable(staffPO)).start();
new StaffTriggerRunnable(staffPO).run();
return ignoreNull;
}
@ -186,7 +186,7 @@ public class StaffServiceImpl extends Service implements StaffService {
// 更新主表
int updateStaff = getStaffMapper().updateStaff(staffPO);
// 同步组织架构图编制信息
new Thread(new StaffTriggerRunnable(staffPO)).start();
new StaffTriggerRunnable(staffPO).run();
return updateStaff;
}
@ -198,7 +198,7 @@ public class StaffServiceImpl extends Service implements StaffService {
List<StaffPO> staffsByIds = getStaffMapper().getStaffsByIds(ids);
int deleteByIds = getStaffMapper().deleteByIds(ids);
for (StaffPO staffsById : staffsByIds) {
new Thread(new StaffTriggerRunnable(staffsById)).start();
new StaffTriggerRunnable(staffsById).run();
}
return deleteByIds;
}

2
src/com/engine/organization/wrapper/CompWrapper.java
Unescape Escape View File

@ -109,7 +109,7 @@ public class CompWrapper extends OrganizationWrapper {
for (CompPO compsById : compsByIds) {
writeOperateLog(new Object() {
}.getClass(), compsById.getCompName(), JSON.toJSONString(ids), "删除分部信息");
new Thread(new CompanyTriggerRunnable(compsById)).start();
new CompanyTriggerRunnable(compsById).run();
}
return deleteByIds;
}

2
src/com/engine/organization/wrapper/DepartmentWrapper.java
Unescape Escape View File

@ -149,7 +149,7 @@ public class DepartmentWrapper extends OrganizationWrapper {
writeOperateLog(new Object() {
}.getClass(), departmentPO.getDeptName(), JSON.toJSONString(ids), "删除部门");
// 更新组织架构图
new Thread(new DepartmentTriggerRunnable(departmentPO)).start();
new DepartmentTriggerRunnable(departmentPO).run();
}
return deleteByIds;
}

2
src/com/engine/organization/wrapper/JobWrapper.java
Unescape Escape View File

@ -187,7 +187,7 @@ public class JobWrapper extends OrganizationWrapper {
writeOperateLog(new Object() {
}.getClass(), jobPO.getJobName(), JSON.toJSONString(ids), "删除岗位");
// 更新组织架构图
new Thread(new JobTriggerRunnable(jobPO)).start();
new JobTriggerRunnable(jobPO).run();
}
return deleteByIds;
}

Write Preview
Loading…
Cancel
Save