From 0f3db47c9a6c03611ac75118017f83d18ae062f2 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期五, 25 十一月 2022 10:33:15 +0800
Subject: [PATCH] Merge branch 'huacheng_test' into haucheng_panzhihua
---
flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java | 9 ++++++---
1 files changed, 6 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 5583d3d..f58bfe8 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
@@ -111,7 +111,10 @@
public TableDataInfo<TransactionEvent> selectConfigList(@RequestBody List<String> DepartmentId,
@CurrentUser SysUser sysUser)
{
-// List<String> ids=iOrganizationChartService.getIds(DepartmentId);
+ if(DepartmentId==null||DepartmentId.size()<1)
+ {
+ DepartmentId=null;
+ }
List<TransactionEvent> list = iTransactionEventService.selectConfigList(null,null,DepartmentId);
int num=iTransactionEventService.countNum(null,null,DepartmentId);
return getDataTable(list,num);
@@ -235,7 +238,7 @@
@GetMapping("/queryByClassifyIdConfigList")
public TableDataInfo queryByClassifyIdConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
@RequestParam(value = "pageSize",required = false) Integer pageSize,
- @RequestParam("classifyId") String classifyId,
+ @RequestParam(value = "classifyId",required = false) String classifyId,
@RequestParam(required = false,name="departmentId") Integer departmentId){
Assert.notNull(pageNum, "pageNum 不能为空");
Assert.notNull(pageSize, "pageSize 不能为空");
@@ -343,7 +346,7 @@
{
boolean a = false;
String fileName = file.getOriginalFilename();
- Integer b = iTransactionEventService.batchImport(fileName, file);
+ Integer b = iTransactionEventService.batchImport(fileName, file);
if (b == 3) {//
return ResultData.success("全部导入成功");//全部导入成功
} else if (b == 2) {
--
Gitblit v1.7.1