|
@@ -324,7 +324,8 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
|
|
|
HttpResponseResult<Integer> succeed = BaseController.succeed(0);
|
|
|
String activeConfig = sysConfigDao.findConfigValue("cloud_teacher_active_config");
|
|
|
List<Cloud2022ActivityDto> cloud2022ActivityDtos = JSONArray.parseArray(activeConfig, Cloud2022ActivityDto.class);
|
|
|
- List<Cloud2022ActivityDto> activityDtos = cloud2022ActivityDtos.stream().filter(e -> e.getOrganId().contains(sysUser.getOrganId().toString())).collect(Collectors.toList());
|
|
|
+ List<Cloud2022ActivityDto> activityDtos = cloud2022ActivityDtos.stream().
|
|
|
+ filter(e -> Arrays.stream(e.getOrganId().split(",")).collect(Collectors.toList()).contains(sysUser.getOrganId().toString())).collect(Collectors.toList());
|
|
|
if(CollectionUtils.isEmpty(activityDtos)){
|
|
|
succeed.setMsg("当前分部暂未开通活动");
|
|
|
return succeed;
|