From 58c4e5bc136226aec9ebd623b6f380c2ac0eb633 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 16 十一月 2022 10:29:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java | 8 ++++----
1 files changed, 4 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 22a806a..1478f5d 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
@@ -92,12 +92,12 @@
@ApiOperation("根据部门id获取导办事物列表")
@GetMapping("/department/getList")
@Authorization
- public TableDataInfo<TransactionEvent> selectConfigList(@RequestParam(value = "DepartmentId",required = false) String DepartmentId,
+ public TableDataInfo<TransactionEvent> selectConfigList(@RequestParam(value = "DepartmentId",required = false) List<String> DepartmentId,
@CurrentUser SysUser sysUser)
{
- List<String> ids=iOrganizationChartService.getIds(DepartmentId);
- List<TransactionEvent> list = iTransactionEventService.selectConfigList(null,null,ids);
- int num=iTransactionEventService.countNum(null,null,ids);
+// List<String> ids=iOrganizationChartService.getIds(DepartmentId);
+ List<TransactionEvent> list = iTransactionEventService.selectConfigList(null,null,DepartmentId);
+ int num=iTransactionEventService.countNum(null,null,DepartmentId);
return getDataTable(list,num);
}
--
Gitblit v1.7.1