判空返回
parent
b66139651f
commit
f72b071efd
|
@ -779,13 +779,16 @@ public class ActivityLogic implements IEventHandler{
|
||||||
Map<Integer, ActivityMission> activityMissionMap = activityManager.getActivityMissionMap();
|
Map<Integer, ActivityMission> activityMissionMap = activityManager.getActivityMissionMap();
|
||||||
for (Map.Entry<Integer, ActivityMission> item : activityMissionMap.entrySet()) {
|
for (Map.Entry<Integer, ActivityMission> item : activityMissionMap.entrySet()) {
|
||||||
ActivityMission activityMission = item.getValue();
|
ActivityMission activityMission = item.getValue();
|
||||||
if (activityMission.getActivityState() != ActivityType.OPEN_STATE) {
|
//7201活动弃用
|
||||||
|
if(activityMission == null){
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
//7201活动弃用
|
|
||||||
if(item.getKey() == 7201){
|
if(item.getKey() == 7201){
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
if (activityMission.getActivityState() != ActivityType.OPEN_STATE) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
AbstractActivity activityType = ActivityTypeEnum.getActicityType(item.getKey());
|
AbstractActivity activityType = ActivityTypeEnum.getActicityType(item.getKey());
|
||||||
if (activityType != null){
|
if (activityType != null){
|
||||||
activityType.checkActivityMissionFinishAndTake(user.getId(),item.getKey(), activityMission);
|
activityType.checkActivityMissionFinishAndTake(user.getId(),item.getKey(), activityMission);
|
||||||
|
|
Loading…
Reference in New Issue