From eddca9819968d95ca160720e778f10e85b921627 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 14 十月 2022 17:43:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java b/flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java
index 60291a6..6f4c86e 100644
--- a/flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java
@@ -85,6 +85,20 @@
{
return ResultData.error("模板名称不能为空");
}
+
+ if(StringUtils.isEmpty(sysUser.getDepartmentId()))
+ {
+ return ResultData.error("部门id不能为空 请分配部门id");
+ }
+
+ List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
+ int num=iReplyTemplateService.countNum(entity.getName(),ids);
+
+ if(num>0)
+ {
+ return ResultData.error("部门里办事名称重复！");
+ }
+
entity.setId(null);
entity.setDepartmentId(sysUser.getDepartmentId());
entity.setCreateUserId(sysUser.getUserId()+"");
@@ -149,6 +163,7 @@
{
return ResultData.error("模板不存在！");
}
+ entity.setName(entity.getName()+"(副本)");
entity.setId(null);
return toAjax(iReplyTemplateService.insertConfig(entity));
}
--
Gitblit v1.7.1