From 6f302d5dcd1d47a9512151d4e31078bc98c62f08 Mon Sep 17 00:00:00 2001 From: fengjin <1435304038@qq.com> Date: 星期二, 18 十月 2022 18:31:17 +0800 Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test --- flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java b/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java index 5987441..7b14947 100644 --- a/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java +++ b/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java @@ -134,11 +134,7 @@ return ResultData.error("事件名称不能为空"); } - String id=iTransactionEventService.selectDataIfExist(entity.getDepartmentId(),entity.getMatterName()); - if(!StringUtils.isEmpty(id)) - { - return ResultData.error("事件名称已存在"); - } + return toAjax(iTransactionEventService.updateConfig(entity)); } @@ -242,4 +238,5 @@ } + } -- Gitblit v1.7.1