Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn

back_recharge
xuexinpeng 2021-12-07 18:38:06 +08:00
commit ca60360b64
1 changed files with 3 additions and 0 deletions

View File

@ -746,6 +746,9 @@ public class ActivityLogic implements IEventHandler{
}
Integer activityId = item.getKey();
SGlobalActivity sGlobalActivity = SGlobalActivity.getsGlobalActivityMap().get(activityId);
if (sGlobalActivity == null){
continue;
}
int targetActivityType = sGlobalActivity.getType();
if (!activityType.contains(targetActivityType)) {
continue;