From c0389942a96788afc96d72a6f9ec1d15a2968c9b Mon Sep 17 00:00:00 2001 From: dxfeng Date: Mon, 6 Jun 2022 16:19:35 +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 --- .../organization/service/impl/DepartmentServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java index 7b449bfa..61056ec1 100644 --- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java +++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java @@ -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());