From 1e91dc33009cfdc951b2642877f40280b51c3089 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 28 二月 2025 15:17:01 +0800
Subject: [PATCH] zjh20250228
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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..fc41316 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
@@ -117,6 +117,7 @@
@ApiOperation(value = "鏍规嵁浣撴浜烘�у埆鍜屾槸鍚︿负鎬绘鏌ヨ浣撴寤鸿鎺ュ彛")
public AjaxResult getKjTjAdviceKjbqBySex(@RequestParam String sex, @RequestParam @ApiParam(value = "1甯歌鍖荤敓 0鎬绘") String isZj,
@RequestParam(required = false) @ApiParam(value ="寤鸿鍐呭") String jynr,
+ @RequestParam(required = false) @ApiParam(value ="寤鸿鏍囬") String jybt,
@ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer page,
@ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize) {
LambdaQueryWrapper<TjAdvice> wq = new LambdaQueryWrapper<>();
@@ -124,6 +125,7 @@
// wq.eq(TjAdvice::getAdSex, sex).or().isNull(TjAdvice::getAdSex);
wq.eq(TjAdvice::getIsZj, isZj);
if(StringUtil.isNotBlank(jynr)) wq.like(TjAdvice::getAdvice,jynr);
+ if(StringUtil.isNotBlank(jybt)) wq.like(TjAdvice::getTitle,jybt);
wq.and(i -> i.eq(TjAdvice::getAdSex, sex).or().isNull(TjAdvice::getAdSex));
Page<TjAdvice> kjbqPage = tjAdviceService.page(page1, wq);
return AjaxResult.success(kjbqPage);
@@ -142,7 +144,7 @@
LambdaQueryWrapper<TjUserAdvice> wq0 = new LambdaQueryWrapper<>();
wq0.eq(TjUserAdvice::getUserId, userId);
List<TjUserAdvice> list = userAdviceService.list(wq0);
- if (null != list && list.size() > 0) {
+ if (null != list && !list.isEmpty()) {
List<Long> longs = list.stream().map(TjUserAdvice::getAdviceId).collect(Collectors.toList());
wq.in(TjAdvice::getId,longs);
wq.last("and (ad_sex=1 OR ad_sex=2)");
@@ -207,7 +209,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 +272,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