From ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 17 Jul 2021 15:59:10 +0800
Subject: [PATCH] 1. 新增套餐中有效和无效的操作 2. 会员修改门店功能 3. 套餐新增编辑次数功能 4. 计算是否为赠送的条件为，全部为赠送金额购买且支付金额大于0 5. 打印小票功能调整间距，和收银人 6. PC端服务单新增划扣金额展示
---
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