Merge remote-tracking branch 'origin/online1' into online1

mec-teacher/src/main/java/com/ym/mec/teacher/controller/VipGroupActivityController.java

@@ -111,7 +111,7 @@ public class VipGroupActivityController extends BaseController {
             if(Objects.nonNull(sysConfig)&&StringUtils.isNotBlank(sysConfig.getParanValue())){
                 Set<Integer> activityIds = Arrays.stream(sysConfig.getParanValue().split(",")).map(id->Integer.valueOf(id)).collect(Collectors.toSet());
                 Iterator<VipGroupActivity> iterator = vipGroupActivities.iterator();
-                if(iterator.hasNext()){
+                while(iterator.hasNext()){
                     VipGroupActivity vipGroupActivity = iterator.next();
                     if(activityIds.contains(vipGroupActivity.getId())){
                         iterator.remove();

mec-web/src/main/java/com/ym/mec/web/controller/VipGroupActivityController.java

@@ -137,7 +137,7 @@ public class VipGroupActivityController extends BaseController {
         if(Objects.nonNull(doubleElevenIdConfig)&&StringUtils.isNotBlank(doubleElevenIdConfig.getParanValue())){
             Set<Integer> activityIds = Arrays.stream(doubleElevenIdConfig.getParanValue().split(",")).map(id->Integer.valueOf(id)).collect(Collectors.toSet());
             Iterator<VipGroupActivity> iterator = vipGroupActivities.iterator();
-            if(iterator.hasNext()){
+            while(iterator.hasNext()){
                 VipGroupActivity vipGroupActivity = iterator.next();
                 if(activityIds.contains(vipGroupActivity.getId())){
                     iterator.remove();