From de8705b32929140107559bd70ce694eaeeb95cb1 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期二, 18 十月 2022 18:59:40 +0800
Subject: [PATCH] 1.新建订单消息发送 2.修改bug
---
flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 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 7bd2b3d..d8b2ecc 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
@@ -39,7 +39,7 @@
@Authorization
public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
@RequestParam(value = "pageSize",required = false) Integer pageSize,
- @RequestParam(value = "Name",required = false) String Name,
+ @RequestParam(value = "name",required = false) String Name,
@CurrentUser SysUser sysUser)
{
Page<ReplyTemplateEntity> pageParam = new Page<>(pageNum,pageSize);
@@ -84,6 +84,19 @@
if(StringUtils.isEmpty(entity.getName()))
{
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);
@@ -150,6 +163,7 @@
{
return ResultData.error("模板不存在！");
}
+ entity.setName(entity.getName()+"(副本)");
entity.setId(null);
return toAjax(iReplyTemplateService.insertConfig(entity));
}
--
Gitblit v1.7.1