BUG修复

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());