From 50e285bbdf015ba996709796d3dd49e8ebca43bd Mon Sep 17 00:00:00 2001 From: OTTO <731554297@qq.com> Date: Tue, 29 Oct 2024 16:30:52 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E7=89=B9=E8=89=B2=E4=B8=93=E5=8C=BA?= =?UTF-8?q?=E4=B8=93=E9=A1=B9=E9=A1=B9=E7=9B=AE):=20=E5=AE=9A=E5=88=B6?= =?UTF-8?q?=E6=B3=9B=E5=9C=A8=E4=B8=93=E5=8C=BA=E5=BC=80=E6=BA=90=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=B1=95=E7=A4=BA=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 计算专区项目贡献者时需考虑非Gitlink用户贡献者无用户名的情况 Signed-off-by: OTTO <731554297@qq.com> --- .../zone/detail/service/impl/ZoneDetailServiceImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/detail/service/impl/ZoneDetailServiceImpl.java b/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/detail/service/impl/ZoneDetailServiceImpl.java index fec80cef0..7eb151787 100644 --- a/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/detail/service/impl/ZoneDetailServiceImpl.java +++ b/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/detail/service/impl/ZoneDetailServiceImpl.java @@ -747,7 +747,13 @@ public class ZoneDetailServiceImpl implements IZoneDetailService { ProjectGitlinkInfoVo gitlinkInfoVo = redisService.getCacheObject(CacheConstants.getZoneProjectGitlinkInfo(zoneProject.getGitlinkProjectId())); if (gitlinkInfoVo != null && gitlinkInfoVo.getContributorsList() != null) { for (JSONObject contributor : gitlinkInfoVo.getContributorsList().toJavaList(JSONObject.class)) { - usernameSet.add(contributor.getString("login")); + String username = contributor.getString("login"); + if (StringUtils.isNotEmpty(username)) { + usernameSet.add(username); + } else { + usernameSet.add(contributor.getString("email")); + } + } } }