From 5dc920e36455a1eab3f61bf67b3c62b974becbcd Mon Sep 17 00:00:00 2001 From: dxfeng Date: Mon, 29 Aug 2022 15:39:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF=E5=88=86?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/service/impl/DepartmentServiceImpl.java | 3 ++- src/com/engine/organization/service/impl/JobServiceImpl.java | 3 ++- .../service/impl/ResourceBasicInfoServiceImpl.java | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java index 914f2634..e0806d2f 100644 --- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java +++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java @@ -418,7 +418,8 @@ public class DepartmentServiceImpl extends Service implements DepartmentService OrganizationAssert.notBlank(copyParam.getCompany(), "请指定需要复制的公司/分部"); int insertCount = 0; List idList = Arrays.stream(copyParam.getIds().split(",")).map(Long::parseLong).collect(Collectors.toList()); - int maxShowOrder = getDepartmentMapper().getMaxShowOrder(); + Integer maxShowOrder = getDepartmentMapper().getMaxShowOrder(); + maxShowOrder = null == maxShowOrder ? 0 : maxShowOrder; for (int i = 0; i < idList.size(); i++) { DepartmentPO deptById = getDepartmentMapper().getDeptById(idList.get(i)); deptById.setDeptName(deptById.getDeptName() + "[复制]"); diff --git a/src/com/engine/organization/service/impl/JobServiceImpl.java b/src/com/engine/organization/service/impl/JobServiceImpl.java index 76b736ad..ef5a8d2c 100644 --- a/src/com/engine/organization/service/impl/JobServiceImpl.java +++ b/src/com/engine/organization/service/impl/JobServiceImpl.java @@ -387,7 +387,8 @@ public class JobServiceImpl extends Service implements JobService { OrganizationAssert.notBlank(department, "请指定需要复制的部门"); int insertCount = 0; List idList = Arrays.stream(ids.split(",")).map(Long::parseLong).collect(Collectors.toList()); - int orderNum = getJobMapper().getMaxShowOrder(); + Integer orderNum = getJobMapper().getMaxShowOrder(); + orderNum = null == orderNum ? 0 : orderNum; for (Long id : idList) { orderNum++; JobPO jobById = getJobMapper().getJobById(id); diff --git a/src/com/engine/organization/service/impl/ResourceBasicInfoServiceImpl.java b/src/com/engine/organization/service/impl/ResourceBasicInfoServiceImpl.java index 2dc94dff..ace9b40d 100644 --- a/src/com/engine/organization/service/impl/ResourceBasicInfoServiceImpl.java +++ b/src/com/engine/organization/service/impl/ResourceBasicInfoServiceImpl.java @@ -163,7 +163,7 @@ public class ResourceBasicInfoServiceImpl extends Service implements ResourceBas fName.setRules("required|string"); SearchConditionItem fMemo = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 60, "说明", "fmemo"); - if (StringUtils.isNotBlank(id)) { + if (!"-1".equals(id) && StringUtils.isNotBlank(id)) { ResourceItemClassPO resourceItemClassPO = getResourceBasicInfoMapper().getResourceItemClassByFid(Integer.parseInt(id)); OrganizationAssert.notNull(resourceItemClassPO, "选择的数据不存在"); fNo.setValue(resourceItemClassPO.getFno());