Merge branch '2021-double-eleven' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupActivityServiceImpl.java

@@ -238,7 +238,7 @@ public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGro
 					}
 				}
 				Long giveNum = maps.get(doubleEleven2021Dto.getOrganId().longValue());
-				doubleEleven2021Dto.setGiveMemberNum(giveNum);
+				doubleEleven2021Dto.setGiveMemberNum(giveNum == null?0l:giveNum);
 			}
 			if(sort.equals("totalBuyAmount")){
 				if(order.equals("ASC")){