From 60df920ac111b6acef1a4b2bf87bd8750d76ed02 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Tue, 20 Feb 2024 09:34:46 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20/act/user/workGroupPage=E8=BF=99?= =?UTF-8?q?=E4=B8=AA=E6=8E=A5=E5=8F=A3=E5=8A=A0=E4=B8=80=E4=B8=AA=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6realnameOrUsername=E6=9F=A5=E5=A7=93?= =?UTF-8?q?=E5=90=8D=E6=88=96=E8=80=85=E5=B7=A5=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/sys/entity/LawsWorkingGroupUser.java | 4 ++++ .../service/impl/LawsWorkingGroupUserServiceImpl.java | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/laws-modules/src/main/java/com/jero/modules/sys/entity/LawsWorkingGroupUser.java b/laws-modules/src/main/java/com/jero/modules/sys/entity/LawsWorkingGroupUser.java index 02b50ba2..ddbe8bdc 100644 --- a/laws-modules/src/main/java/com/jero/modules/sys/entity/LawsWorkingGroupUser.java +++ b/laws-modules/src/main/java/com/jero/modules/sys/entity/LawsWorkingGroupUser.java @@ -89,4 +89,8 @@ public class LawsWorkingGroupUser implements Serializable { @ApiModelProperty(value = "岗位") @Excel(name = "岗位",width = 15) private String userPostName; + + @TableField(exist = false) + @ApiModelProperty(value = "姓名工号通用查询字段") + private String realnameOrUsername; } diff --git a/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsWorkingGroupUserServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsWorkingGroupUserServiceImpl.java index 504e6d96..09caa337 100644 --- a/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsWorkingGroupUserServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsWorkingGroupUserServiceImpl.java @@ -76,6 +76,16 @@ public class LawsWorkingGroupUserServiceImpl extends ServiceImpl wrapper = getWrapper(realname, userName, userRoleName, userPostName, workingGroupId); + if (StringUtils.isNotBlank(lawsWorkingGroupUser.getRealnameOrUsername())) { + QueryWrapper userWrapper = new QueryWrapper<>(); + userWrapper.like("realname", lawsWorkingGroupUser.getRealnameOrUsername()) + .or().like("username", lawsWorkingGroupUser.getRealnameOrUsername()); + List users = sysUserService.list(userWrapper); + if (CollectionUtils.isNotEmpty(users)) { + List userIds = users.stream().map(SysUser::getId).collect(Collectors.toList()); + wrapper.in("user_id", userIds); + } + } // 没选上面四个筛选条件时 return page(page, wrapper); }