From 07914b04647ccb8c8cb5f4b04e43b4b5b6c8c07d Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 26 十月 2022 15:41:58 +0800
Subject: [PATCH] 修改回复模板超管添加报错 bug
---
flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java b/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java
index f44ee1d..71521b5 100644
--- a/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java
@@ -66,10 +66,10 @@
Assert.notNull(pageNum, "pageNum 不能为空");
Assert.notNull(pageSize, "pageSize 不能为空");
Page<TransactionEvent> pageParam = new Page<>(pageNum,pageSize);
- List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
+// List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
List<TransactionEvent> list = iTransactionEventService.selectConfigList(pageParam,pageSize,keyword,
- classifyGrade,ids);
- int num=iTransactionEventService.countNum(keyword,classifyGrade,ids);
+ classifyGrade,null);
+ int num=iTransactionEventService.countNum(keyword,classifyGrade,null);
return getDataTable(list,num);
}
@@ -244,7 +244,8 @@
*/
@ApiOperation(value = "办事指南复制",response = ResultData.class)
@GetMapping("/copy")
- public ResultData copy(@RequestParam("Id") String Id)
+ @Authorization
+ public ResultData copy(@RequestParam("Id") String Id,@CurrentUser SysUser sysUser)
{
if(StringUtils.isEmpty(Id))
{
@@ -256,6 +257,8 @@
{
return ResultData.error("复制项不存在");
}
+
+ transactionEvent.setDepartmentId(sysUser.getDepartmentId());
transactionEvent.setMatterName(transactionEvent.getMatterName()+"(副本)");
transactionEvent.setId(null);
@@ -263,6 +266,19 @@
}
+ /**
+ * 办事指南根据分类id筛选
+ * @return
+ */
+ @ApiOperation(value = "办事指南根据分类id筛选",response = ResultData.class)
+ @GetMapping("/selectClassifyList")
+ @Authorization
+ public TableDataInfo<TransactionEvent> selectClassifyList(@RequestParam("ids") List<String> ids)
+ {
+ return getDataTable(iTransactionEventService.selectClassifyList(ids));
+ }
+
+
--
Gitblit v1.7.1