From db67d2c23022fed302b8cb07f03076b07ab0941b Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 16 十一月 2022 11:16:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

---
 flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 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 444bc96..fa653f5 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
@@ -90,14 +90,14 @@
      * @return
      */
     @ApiOperation("根据部门id获取导办事物列表")
-    @GetMapping("/department/getList")
+    @PostMapping("/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(sysUser.getDepartmentId());
-        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