From 24989daf09c17a0f42a5f3780ac3d0dfd853a1d1 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Thu, 3 Jan 2019 14:35:06 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=AE=A1=E7=90=86=E7=88=B6?= =?UTF-8?q?=E8=8A=82=E7=82=B9Bug=20=E4=BF=AE=E5=A4=8D=20=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=88=B6=E8=8A=82=E7=82=B9Bug=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=20=E5=A4=8D=E6=9D=82=E6=9F=A5=E8=AF=A2=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=BB=98=E8=AE=A4=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/apiservice/serviceimpl/busi/CoreTreeService.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeService.java index 1c6665f..4b56eea 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeService.java @@ -165,8 +165,18 @@ public class CoreTreeService implements ICoreTreeService { @Override @ApiOperation(value = "父节点检查",notes = "检查部门的父节点是否是当前节点的子节点") public void doValidatorSysDepartmentParentId(SysDepartment department) { - findSysDepartmentChildrenTreePack(department,0); - validatorSysDepartmentParentId(department.getChildList(),department.getParentId()); + if(department != null){ + if(department.getParentId().longValue() == department.getId().longValue()){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("上级部门不能为当前部门") + .setErrorSolution("请重新操作") + .build(); + } + findSysDepartmentChildrenTreePack(department,0); + validatorSysDepartmentParentId(department.getChildList(),department.getParentId()); + } } @Override