From 6f30b5c886cd05081d6250eb0506816fb2ac80ec Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 22 十一月 2022 14:11:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 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 d8b2ecc..34d494f 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
@@ -8,6 +8,7 @@
import com.dg.core.db.gen.entity.SysUser;
import com.dg.core.service.IOrganizationChartService;
import com.dg.core.service.IReplyTemplateService;
+import com.dg.core.util.PermissionUtil;
import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -43,8 +44,14 @@
@CurrentUser SysUser sysUser)
{
Page<ReplyTemplateEntity> pageParam = new Page<>(pageNum,pageSize);
- List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
- List<ReplyTemplateEntity> list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids);
+ List<String> ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
+ List<ReplyTemplateEntity> list;
+ if (sysUser.getUserType().equals("1")||sysUser.getIsDivisionHead().equals("1")){
+ list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids,null);
+ }
+ else {
+ list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids,sysUser.getUserId());
+ }
int num=iReplyTemplateService.countNum(Name,ids);
return getDataTable(list,num);
}
@@ -86,12 +93,12 @@
return ResultData.error("模板名称不能为空");
}
- if(StringUtils.isEmpty(sysUser.getDepartmentId()))
+ if(StringUtils.isEmpty(entity.getDepartmentId()))
{
return ResultData.error("部门id不能为空 请分配部门id");
}
- List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
+ List<String> ids=iOrganizationChartService.getIds(entity.getDepartmentId());
int num=iReplyTemplateService.countNum(entity.getName(),ids);
if(num>0)
@@ -100,7 +107,7 @@
}
entity.setId(null);
- entity.setDepartmentId(sysUser.getDepartmentId());
+ entity.setDepartmentId(entity.getDepartmentId());
entity.setCreateUserId(sysUser.getUserId()+"");
return toAjax(iReplyTemplateService.insertConfig(entity));
@@ -150,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))
{
@@ -163,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