diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/material/query/UserBadgeTableQryExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/material/query/UserBadgeTableQryExe.java index 783682e5..39b2d361 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/material/query/UserBadgeTableQryExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/material/query/UserBadgeTableQryExe.java @@ -112,6 +112,10 @@ public class UserBadgeTableQryExe { } private Long getBadgeExpireTime(BadgeBackpack badgeBackpack) { + if (Objects.isNull(badgeBackpack)) { + return null; + } + return Objects.equals(badgeBackpack.getExpireType(), BadgeBackpackExpireType.PERMANENT.name()) ? TimestampUtils.nowPlusYear(10).getTime() : badgeBackpack.getExpireTime().getTime();