From 38b5da7912ca6ab2bb2bb001cd55803bbb849d29 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 23 十一月 2022 18:25:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java | 5 +++--
1 files changed, 3 insertions(+), 2 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 2b1a29a..e8e2838 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,7 +44,7 @@
@CurrentUser SysUser sysUser)
{
Page<ReplyTemplateEntity> pageParam = new Page<>(pageNum,pageSize);
- List<String> ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
+ List<String> ids=PermissionUtil.getStairDepartment(sysUser,iOrganizationChartService);
List<ReplyTemplateEntity> list;
if (sysUser.getUserType().equals("1")||sysUser.getIsDivisionHead().equals("1")){
list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids,null);
@@ -157,7 +157,7 @@
@ApiOperation("复制模板")
@PostMapping("/copy")
@Authorization
- public ResultData copy(@RequestParam(value = "Id",required = false) String Id)
+ public ResultData copy(@RequestParam(value = "Id",required = false) String Id,@CurrentUser SysUser sysUser)
{
if(StringUtils.isEmpty(Id))
{
@@ -170,6 +170,7 @@
{
return ResultData.error("模板不存在！");
}
+ entity.setCreateUserId(sysUser.getUserId());
entity.setName(entity.getName()+"(副本)");
entity.setId(null);
return toAjax(iReplyTemplateService.insertConfig(entity));
--
Gitblit v1.7.1