From 27cd97ef59365e2bae0c66c3c3078af0c1f374be Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Tue, 23 Jan 2024 11:52:20 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E8=81=94=E7=BB=9C=E4=BA=BA=E7=AE=A1?= =?UTF-8?q?=E7=90=86):=2081037?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/laws/system/entity/LawsContactManage.java | 5 +++++ .../service/impl/LawsContactManageServiceImpl.java | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/system/entity/LawsContactManage.java b/laws-modules/src/main/java/com/jero/modules/laws/system/entity/LawsContactManage.java index c52fdc92..96c6e364 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/system/entity/LawsContactManage.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/system/entity/LawsContactManage.java @@ -87,4 +87,9 @@ public class LawsContactManage implements Serializable { @ApiModelProperty(value = "部门联络人主管级领导id") @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname") private java.lang.String leaderId; + + /**联络人 搜索用*/ + @ApiModelProperty(value = "联络人 搜索用") + @TableField(exist = false) + private java.lang.String contact; } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/system/service/impl/LawsContactManageServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/system/service/impl/LawsContactManageServiceImpl.java index a39c3ba0..2798e71e 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/system/service/impl/LawsContactManageServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/system/service/impl/LawsContactManageServiceImpl.java @@ -23,6 +23,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; /** @@ -52,6 +53,14 @@ public class LawsContactManageServiceImpl extends ServiceImpl queryPage(LawsContactManage lawsContactManage, Integer pageNo, Integer pageSize, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsContactManage, req.getParameterMap()); + if (StringUtils.isNotBlank(lawsContactManage.getContact())){ + List userList = sysUserService.list(new LambdaQueryWrapper() + .like(SysUser::getRealname, lawsContactManage.getContact())); + if (userList.isEmpty()){ + return new Page<>(pageNo, pageSize); + } + queryWrapper.in("contact_id", userList.stream().map(SysUser::getId).collect(Collectors.toList())); + } Page page = new Page<>(pageNo, pageSize); return page(page, queryWrapper); }