diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java index 14a9d2ad1..d94541657 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java @@ -1455,11 +1455,13 @@ public class ActivityLogic implements IEventHandler{ public static boolean checkActivityOpen(User user, int activityType) { ActivityManager activityManager = user.getActivityManager(); Map activityMissionMap = activityManager.getActivityMissionMap(); + Map activityMap = SGlobalActivity.getsGlobalActivityMap(); for (Map.Entry item : activityMissionMap.entrySet()) { - if (item.getKey() == activityType) { + if (item.getKey() == activityType && activityMap.get(activityType) != null) { return true; } } + LOGGER.error("未开启或者活动表已删除的活动id:{}",activityType); return false; }