From 05372fd5f0eb8a0f5ed65e7691fe569dd3fbd9f0 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期六, 15 十月 2022 18:06:23 +0800
Subject: [PATCH] 1.修改bug 2.后台首页小程序统计
---
flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 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 6be56ea..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
@@ -44,17 +44,6 @@
{
Page<ReplyTemplateEntity> pageParam = new Page<>(pageNum,pageSize);
List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
- String[] roles = sysUser.getRoleIds().split(",");
- Integer isRole=0;//是否超管
- for (String role: roles) {
- if (role.equals("1")){
- isRole=1;
- break;
- }
- }
- if (isRole.equals(1)){
- ids=null;
- }
List<ReplyTemplateEntity> list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids);
int num=iReplyTemplateService.countNum(Name,ids);
return getDataTable(list,num);
@@ -96,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()+"");
@@ -160,6 +163,7 @@
{
return ResultData.error("模板不存在！");
}
+ entity.setName(entity.getName()+"(副本)");
entity.setId(null);
return toAjax(iReplyTemplateService.insertConfig(entity));
}
--
Gitblit v1.7.1