From 878500afec6c7daa644b9573fd56e9903cf5d39f Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 13 十月 2022 13:51:39 +0800
Subject: [PATCH] 修改添加办事指南，名称需要做判重bug
---
flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 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 0b17e82..6be56ea 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
@@ -6,6 +6,7 @@
import com.dg.core.annotation.CurrentUser;
import com.dg.core.db.gen.entity.ReplyTemplateEntity;
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.TableDataInfo;
import io.swagger.annotations.Api;
@@ -25,19 +26,37 @@
@Autowired
IReplyTemplateService iReplyTemplateService;
+ @Autowired
+ IOrganizationChartService iOrganizationChartService;
+
+
/**
* 获取模板列表
* @return
*/
@ApiOperation("获取模板列表")
@GetMapping("/getlist")
+ @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);
- List<ReplyTemplateEntity> list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name);
- int num=iReplyTemplateService.countNum(Name);
+ 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);
}
@@ -48,6 +67,7 @@
*/
@ApiOperation("获取详情")
@GetMapping("/getdata")
+ @Authorization
public ResultData selectConfigData(@RequestParam(value = "Id",required = false) String Id)
{
if(StringUtils.isEmpty(Id))
@@ -76,7 +96,6 @@
{
return ResultData.error("模板名称不能为空");
}
-
entity.setId(null);
entity.setDepartmentId(sysUser.getDepartmentId());
entity.setCreateUserId(sysUser.getUserId()+"");
@@ -91,6 +110,7 @@
*/
@ApiOperation("更新模板")
@PostMapping("/update")
+ @Authorization
public ResultData updateConfig(@RequestBody ReplyTemplateEntity entity)
{
if(entity==null)
@@ -112,6 +132,7 @@
*/
@ApiOperation("删除模板")
@DeleteMapping("/delete")
+ @Authorization
public ResultData deleteConfigById(@RequestParam(value = "Id",required = false) String Id)
{
return toAjax(iReplyTemplateService.deleteConfigById(Id));
@@ -125,6 +146,7 @@
*/
@ApiOperation("复制模板")
@PostMapping("/copy")
+ @Authorization
public ResultData copy(@RequestParam(value = "Id",required = false) String Id)
{
if(StringUtils.isEmpty(Id))
--
Gitblit v1.7.1