From 08f1b1f1804a8bd833d42f257908d80e88387b55 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 11:27:47 +0800
Subject: [PATCH] 3.5增加登录验证、修改密码、人员列表调整
---
flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 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..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
@@ -85,15 +85,18 @@
Assert.notNull(pageSize, "pageSize 不能为空");
Page<TransactionEvent> pageParam = new Page<>(pageNum,pageSize);
List<TransactionEvent> list;
- if (departmentId!=null){
+ 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);
+ num=iTransactionEventService.countNum(keyword,classifyGrade,null);
}
- int num=iTransactionEventService.countNum(keyword,classifyGrade,null);
return getDataTable(list,num);
}
@@ -108,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);
@@ -232,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 不能为空");
@@ -340,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