feat: /act/user/workGroupPage这个接口加一个查询条件realnameOrUsername查姓名或者工号

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

laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsWorkingGroupUserServiceImpl.java

@@ -76,6 +76,16 @@ public class LawsWorkingGroupUserServiceImpl extends ServiceImpl<LawsWorkingGrou
 		String workingGroupId = lawsWorkingGroupUser.getWorkingGroupId();
 
 		QueryWrapper<LawsWorkingGroupUser> wrapper = getWrapper(realname, userName, userRoleName, userPostName, workingGroupId);
+		if (StringUtils.isNotBlank(lawsWorkingGroupUser.getRealnameOrUsername())) {
+			QueryWrapper<SysUser> userWrapper = new QueryWrapper<>();
+			userWrapper.like("realname", lawsWorkingGroupUser.getRealnameOrUsername())
+					.or().like("username", lawsWorkingGroupUser.getRealnameOrUsername());
+			List<SysUser> users = sysUserService.list(userWrapper);
+			if (CollectionUtils.isNotEmpty(users)) {
+				List<String> userIds = users.stream().map(SysUser::getId).collect(Collectors.toList());
+				wrapper.in("user_id", userIds);
+			}
+		}
 		// 没选上面四个筛选条件时
         return page(page, wrapper);
     }