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 62c7fb66b..746c94d5a 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 @@ -2008,7 +2008,7 @@ public class ActivityLogic implements IEventHandler{ */ public int getActivityByTypeToFirst(User user, int type){ List activities = SGlobalActivity.getsGlobalActivityMapByType(type); - if (activities.isEmpty() || activities == null){ + if (activities == null || activities.isEmpty()){ return 0; } Map map = user.getActivityManager().getActivityMissionMap(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java index fa685ea37..a187e3fb2 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java @@ -113,12 +113,12 @@ public class MissionLoigc { int activity = ActivityLogic.getInstance().getActivityByTypeToFirst(user, ActivityType.DonghaiXunxian); if (activity <= 0){ - LOGGER.error("获取任务信息,东海寻仙任务,根据活动类型找不到活动,类型:{}",ActivityType.DonghaiXunxian); + LOGGER.info("获取任务信息,东海寻仙任务,东海寻仙活动暂未开启,类型:{}",ActivityType.DonghaiXunxian); return; } List taskConfigs = SThemeActivityTaskConfig.themeTaskByActivity.get(activity); - if (taskConfigs.isEmpty() || taskConfigs == null){ + if (taskConfigs == null || taskConfigs.isEmpty()){ LOGGER.error("获取任务信息,东海寻仙任务,根据活动id找不到任务,活动id:{}",activity); return; }