From f20eab3d08011a159e728f5dbfd3197b8ba84d09 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 17 十二月 2024 14:13:00 +0800
Subject: [PATCH] zjh202412017
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java
index 2389090..f733795 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java
@@ -207,7 +207,7 @@
@ApiParam(value = "寤鸿") @RequestParam(required = false) String nr,
@ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer page,
@ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize,
- @RequestParam(value = "deptId")String deptId) {
+ @RequestParam(required = false)String deptId) {
// LambdaQueryWrapper<SysDept> wrapper = new LambdaQueryWrapper<>();
// wrapper.eq(SysDept::getParentId, 0);
// SysDept sysDept = sysDeptService.getOne(wrapper);
@@ -270,8 +270,8 @@
// }
// map.put("list", list);
// map.put("total", page2.getTotal());
- List<TjAdvice> tjAdvices = tjAdviceService.selectList(proName, deptId, (page - 1) * pageSize, pageSize);
- Integer count = tjAdviceService.selectListCount(proName, deptId);
+ List<TjAdvice> tjAdvices = tjAdviceService.selectList(proName, deptId, (page - 1) * pageSize, pageSize,bt,nr);
+ Integer count = tjAdviceService.selectListCount(proName, deptId,bt,nr);
HashMap<String, Object> hashMap = new HashMap<>();
hashMap.put("list",tjAdvices);
hashMap.put("total",count);
--
Gitblit v1.8.0