From 7dd58dc53f80b671b58d60541314e897ef4c138b Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 17 十一月 2022 14:13:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java | 5 ++++-
1 files changed, 4 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 2de03ad..eafe07c 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
@@ -85,15 +85,18 @@
Assert.notNull(pageSize, "pageSize 不能为空");
Page<TransactionEvent> pageParam = new Page<>(pageNum,pageSize);
List<TransactionEvent> list;
+ int num;
if (departmentId!=null){
List<String> ids=iOrganizationChartService.getDepartmentId(departmentId);
list = iTransactionEventService.selectConfigList(pageParam,pageSize,keyword,
classifyGrade,ids);
+ num=iTransactionEventService.countNum(keyword,classifyGrade,ids);
+
}else {
list = iTransactionEventService.selectConfigList(pageParam,pageSize,keyword,
classifyGrade,null);
+ num=iTransactionEventService.countNum(keyword,classifyGrade,null);
}
- int num=iTransactionEventService.countNum(keyword,classifyGrade,null);
return getDataTable(list,num);
}
--
Gitblit v1.7.1