|
@@ -777,8 +777,8 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
|
|
|
Set<String> subjectIds =groupIds.keySet();
|
|
|
Map<String, Object> params = new HashMap<>();
|
|
|
MapUtil.populateMap(params, queryInfo);
|
|
|
- if (StringUtils.isNotBlank(queryInfo.getMusicGroupId())) {
|
|
|
- subjectIds.clear();
|
|
|
+ if (StringUtils.isNotBlank(queryInfo.getMusicGroupId()) && subjectIds.contains(queryInfo.getMusicGroupId())) {
|
|
|
+ subjectIds = new HashSet<>();
|
|
|
subjectIds.add(queryInfo.getMusicGroupId());
|
|
|
}
|
|
|
params.put("subjectIds", subjectIds);
|