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

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentExtracurricularExercisesSituationServiceImpl.java

@@ -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);