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); }