From 40874ba639745413d256a555f8d1a7014c15fb6c Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 21 十一月 2022 14:34:37 +0800
Subject: [PATCH] 修改人员配置部门报错
---
flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 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..1aca19b 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,15 +78,25 @@
@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;
+ int num;
+ if (departmentId!=null&&departmentId.length()>0){
+ 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);
- int num=iTransactionEventService.countNum(keyword,classifyGrade,null);
+ num=iTransactionEventService.countNum(keyword,classifyGrade,null);
+ }
return getDataTable(list,num);
}
@@ -101,6 +111,10 @@
public TableDataInfo<TransactionEvent> selectConfigList(@RequestBody List<String> DepartmentId,
@CurrentUser SysUser sysUser)
{
+ if(DepartmentId==null||DepartmentId.size()<1)
+ {
+ DepartmentId=null;
+ }
// List<String> ids=iOrganizationChartService.getIds(DepartmentId);
List<TransactionEvent> list = iTransactionEventService.selectConfigList(null,null,DepartmentId);
int num=iTransactionEventService.countNum(null,null,DepartmentId);
--
Gitblit v1.7.1