From 4040856595952ea0b8f8b764ba2770d5c244c891 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 14 十月 2022 11:19:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into local_20221010
---
flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 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 f5950d9..60291a6 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,11 +6,12 @@
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.StringUtils;
import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -25,19 +26,26 @@
@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());
+ List<ReplyTemplateEntity> list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids);
+ int num=iReplyTemplateService.countNum(Name,ids);
return getDataTable(list,num);
}
@@ -48,6 +56,7 @@
*/
@ApiOperation("获取详情")
@GetMapping("/getdata")
+ @Authorization
public ResultData selectConfigData(@RequestParam(value = "Id",required = false) String Id)
{
if(StringUtils.isEmpty(Id))
@@ -76,7 +85,6 @@
{
return ResultData.error("模板名称不能为空");
}
-
entity.setId(null);
entity.setDepartmentId(sysUser.getDepartmentId());
entity.setCreateUserId(sysUser.getUserId()+"");
@@ -91,6 +99,7 @@
*/
@ApiOperation("更新模板")
@PostMapping("/update")
+ @Authorization
public ResultData updateConfig(@RequestBody ReplyTemplateEntity entity)
{
if(entity==null)
@@ -112,6 +121,7 @@
*/
@ApiOperation("删除模板")
@DeleteMapping("/delete")
+ @Authorization
public ResultData deleteConfigById(@RequestParam(value = "Id",required = false) String Id)
{
return toAjax(iReplyTemplateService.deleteConfigById(Id));
@@ -125,6 +135,7 @@
*/
@ApiOperation("复制模板")
@PostMapping("/copy")
+ @Authorization
public ResultData copy(@RequestParam(value = "Id",required = false) String Id)
{
if(StringUtils.isEmpty(Id))
--
Gitblit v1.7.1