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

Merge remote-tracking branch 'origin/develop' into feature/ml

This commit is contained in:
Mlin 2022-12-15 14:39:06 +08:00
parent b3057e2f4e 84a5fc3879
commit 3be6bf11a2
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/organization/service/impl/DepartmentServiceImpl.java
View File

@ -565,7 +565,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
Map<String, Object> map = new HashMap<>();
map.put("id", Util.null2String(mergeParam.getId()));
// 删除部门
ServiceUtil.getService(OrganizationServiceImpl.class, user).delDepartment(map, user);
ServiceUtil.getService(OrganizationServiceImpl.class, user).doDepartmentCancel(map, user);
// 更新组织架构图
// TODO new DepartmentTriggerRunnable(mergeDepartment).run();
// 更新部门合并后名称

4
src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java
View File

@ -122,7 +122,9 @@ public class ManagerDetachServiceImpl extends Service implements ManagerDetachSe
ManagerDetachPO managerDetachPO = ManagerDetachPO.builder()
.managerType(0)
.ecManager(param.getEcManager())
.jclManager(param.getEcManager())
.ecRolelevel(param.getEcRolelevel())
.jclRolelevel(param.getEcRolelevel())
.manageModule("组织管理")
.creator((long)user.getUID())
.deleteType(0)
@ -139,6 +141,8 @@ public class ManagerDetachServiceImpl extends Service implements ManagerDetachSe
.id(param.getId())
.ecManager(param.getEcManager())
.ecRolelevel(param.getEcRolelevel())
.jclManager(param.getEcManager())
.jclRolelevel(param.getEcRolelevel())
.build();
return getMangeDetachMapper().updateDetach(managerDetachPO);
}