From 4351e71d782741143a98f86f6648acd16689165f Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Fri, 27 May 2022 19:48:02 +0800 Subject: [PATCH] Merge branch 'developer' into hive2.0 --- zq-erp/src/main/java/com/matrix/system/hive/action/DepartInfoController.java | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/DepartInfoController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/DepartInfoController.java index 7a5e5d7..eb30467 100644 --- a/zq-erp/src/main/java/com/matrix/system/hive/action/DepartInfoController.java +++ b/zq-erp/src/main/java/com/matrix/system/hive/action/DepartInfoController.java @@ -1,5 +1,6 @@ package com.matrix.system.hive.action; +import com.matrix.core.exception.GlobleException; import com.matrix.core.pojo.AjaxResult; import com.matrix.core.pojo.PaginationVO; import com.matrix.core.tools.WebUtil; @@ -58,7 +59,9 @@ public @ResponseBody AjaxResult addOrModify(SysDepartInfo departInfo) { if (departInfo.getId() != null) { - + if (departInfo.getParentId() != null && departInfo.getParentId().equals(departInfo.getId())) { + throw new GlobleException("父级不能是自己"); + } return modify(currentService, departInfo, "部门"); } else { QueryUtil.setQueryLimit(departInfo); -- Gitblit v1.9.1