From 4a7944290c83632bde74d0f0c45a142cf4a782dd Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 17 十月 2022 10:34:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' 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