|
@@ -15,10 +15,8 @@ import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
-import java.util.Arrays;
|
|
|
-import java.util.Collections;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Objects;
|
|
|
+import java.util.*;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
* @Author Joburgess
|
|
@@ -70,6 +68,9 @@ public class VipGroupActivityController extends BaseController {
|
|
|
if(Objects.isNull(sysConfig)|| StringUtils.isBlank(sysConfig.getParanValue())){
|
|
|
return succeed(Collections.EMPTY_LIST);
|
|
|
}
|
|
|
+ Set<Integer> specialActivityIds = Arrays.stream(sysConfig.getParanValue().split(",")).map(Integer::valueOf).collect(Collectors.toSet());
|
|
|
+ List<VipGroupActivity> results = vipGroupActivities.stream().filter(e -> specialActivityIds.contains(e.getId())).collect(Collectors.toList());
|
|
|
+ return succeed(results);
|
|
|
}
|
|
|
return succeed(vipGroupActivities);
|
|
|
}
|