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

!56 BUG修复 

Merge pull request !56 from dxfeng/feature/dxf
This commit is contained in:
dxfeng 2022-06-06 08:20:14 +00:00 committed by Gitee
parent 6921ac170a c0389942a9
commit 36b10cd628
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -443,8 +443,8 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
public int mergeDepartment(DepartmentMergeParam mergeParam) {
int updateCount = 0;
OrganizationAssert.isFalse(mergeParam.getId().equals(mergeParam.getDepartment()), "所选部门与待合并部门一致，无需操作");
OrganizationAssert.isNull(mergeParam.getDepartment(), "请选择需要合并的部门");
OrganizationAssert.isBlank(mergeParam.getMergeName(), "请输入合并后的名称");
OrganizationAssert.notNull(mergeParam.getDepartment(), "请选择需要合并的部门");
OrganizationAssert.notBlank(mergeParam.getMergeName(), "请输入合并后的名称");
// 所选部门
DepartmentPO mergeDepartment = getDepartmentMapper().getDeptById(mergeParam.getId());
mergeDepartment.setDeptName(mergeParam.getMergeName());