From fdc1bd4ed5a1aced99556bed3bd27843eae6559c Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 16 十一月 2022 10:04:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java | 2 +-
1 files changed, 1 insertions(+), 1 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..22a806a 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
@@ -95,7 +95,7 @@
public TableDataInfo<TransactionEvent> selectConfigList(@RequestParam(value = "DepartmentId",required = false) String DepartmentId,
@CurrentUser SysUser sysUser)
{
- List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
+ List<String> ids=iOrganizationChartService.getIds(DepartmentId);
List<TransactionEvent> list = iTransactionEventService.selectConfigList(null,null,ids);
int num=iTransactionEventService.countNum(null,null,ids);
return getDataTable(list,num);
--
Gitblit v1.7.1