From b6388357fbdd431060b02f14e9ce41e844931c23 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期四, 17 十一月 2022 13:56:38 +0800
Subject: [PATCH] 1.办事指南部门获取筛选 2.修改Bug
---
flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 96f601b..2de03ad 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
@@ -78,14 +78,21 @@
@RequestParam(value = "pageSize",required = false) Integer pageSize,
@RequestParam(value = "keyword",required = false) String keyword,
@RequestParam(value = "classifyGrade",required = false) String classifyGrade,
+ @RequestParam(value = "departmentId",required = false) String departmentId,
@CurrentUser SysUser sysUser)
{
Assert.notNull(pageNum, "pageNum 不能为空");
Assert.notNull(pageSize, "pageSize 不能为空");
Page<TransactionEvent> pageParam = new Page<>(pageNum,pageSize);
-// List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
- List<TransactionEvent> list = iTransactionEventService.selectConfigList(pageParam,pageSize,keyword,
+ List<TransactionEvent> list;
+ if (departmentId!=null){
+ List<String> ids=iOrganizationChartService.getDepartmentId(departmentId);
+ list = iTransactionEventService.selectConfigList(pageParam,pageSize,keyword,
+ classifyGrade,ids);
+ }else {
+ list = iTransactionEventService.selectConfigList(pageParam,pageSize,keyword,
classifyGrade,null);
+ }
int num=iTransactionEventService.countNum(keyword,classifyGrade,null);
return getDataTable(list,num);
}
--
Gitblit v1.7.1