From 0eb8d22f0e8d004b1e721cdd24b8e663bc80b6a2 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 24 十月 2022 16:18:23 +0800
Subject: [PATCH] 修改选择项部门权限显示 bug
---
flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 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 43439b1..0c9ae2f 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);
}
@@ -80,9 +80,9 @@
*/
@ApiOperation(value = "导办事物列表(不分页)",response = TransactionEvent.class)
@GetMapping("/selectList")
- public TableDataInfo selectList()
+ public TableDataInfo selectList(@RequestParam(value = "keyWord",required = false) String keyWord)
{
- return getDataTable(iTransactionEventService.selectList());
+ return getDataTable(iTransactionEventService.selectList(keyWord));
}
/**
@@ -235,7 +235,6 @@
@GetMapping("/smartConsulting")
public RecommendResult smartConsulting(@RequestParam("keyWord") String keyWord){
return iTransactionEventService.smartConsulting(keyWord);
-
}
@@ -257,6 +256,8 @@
{
return ResultData.error("复制项不存在");
}
+ transactionEvent.setMatterName(transactionEvent.getMatterName()+"(副本)");
+
transactionEvent.setId(null);
return toAjax(iTransactionEventService.insertConfig(transactionEvent));
}
--
Gitblit v1.7.1