|
@@ -99,7 +99,10 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
|
|
|
|
|
|
Set<Integer> organIds = null;
|
|
|
if(StringUtils.isNotBlank(queryInfo.getOrganId())){
|
|
|
- organIds = Arrays.stream(queryInfo.getOrganId().split(",")).filter(id -> !OrganizationService.EXCLUDE_ORGAN_IDS.contains(id)).map(Integer::new).collect(Collectors.toSet());
|
|
|
+ organIds = Arrays.stream(queryInfo.getOrganId().split(",")).map(Integer::new).collect(Collectors.toSet());
|
|
|
+ }
|
|
|
+ if("MEMBER_STUDENT_NUM,CLOUD_STUDY_LIVELY_STUDENT_NUM,CLOUD_STUDY_DAY_USE_STUDENT_NUM,CLOUD_STUDY_NEW_STUDENT_NUM".equals(queryInfo.getDataTypes())){
|
|
|
+ organIds = organIds.stream().filter(id -> !OrganizationService.EXCLUDE_ORGAN_IDS.contains(id)).collect(Collectors.toSet());
|
|
|
}
|
|
|
Set<String> dataTypes = new HashSet<>();
|
|
|
if(StringUtils.isNotBlank(queryInfo.getDataTypes())){
|