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/common/actions/CustomerDictionaryAction.java | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/common/actions/CustomerDictionaryAction.java b/zq-erp/src/main/java/com/matrix/system/common/actions/CustomerDictionaryAction.java index f41b1b5..6052076 100644 --- a/zq-erp/src/main/java/com/matrix/system/common/actions/CustomerDictionaryAction.java +++ b/zq-erp/src/main/java/com/matrix/system/common/actions/CustomerDictionaryAction.java @@ -111,6 +111,10 @@ @RequestMapping(value = "/modifyDataDictionary") public @ResponseBody AjaxResult modifyDataDictionary(CustomerDataDictionary newDataDictionary) { + // 自己不能是自己的父节点 + if (newDataDictionary.getParentId() != null && newDataDictionary.getParentId().equals(newDataDictionary.getId())) { + throw new GlobleException("父级不能是自己"); + } dataDictionaryDao.updateByModel(newDataDictionary); return new AjaxResult(AjaxResult.STATUS_SUCCESS, SystemMessageCode.UPDATE_SUCCES, "数据字典"); -- Gitblit v1.9.1