Merge branch 'master_prb_gn' into master_test_gn
commit
e6d3b7a85c
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue