Merge branch 'feature/1015-cbs-music' into test

# Conflicts:
#	mec-application/src/main/java/com/ym/mec/student/controller/StudentManageController.java

mec-application/src/main/java/com/ym/mec/student/controller/StudentManageController.java

@@ -1,5 +1,7 @@
 package com.ym.mec.student.controller;
 
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
 import com.microsvc.toolkit.middleware.oss.wrapper.OssWrapper;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
@@ -274,15 +276,19 @@ public class StudentManageController extends BaseController {
         // 扩展乐器
         if (student.getExtSjectNamesMap() !=null && !student.getExtSjectNamesMap().isEmpty()) {
             Set<Integer> integers = student.getExtSjectNamesMap().keySet();
+            Set<Integer> extInstrumentIds = Sets.newConcurrentHashSet();
             for (Integer integer : integers) {
                 if ("5".equals(integer.toString())) {
-                    integers.add(6);
+                    extInstrumentIds.add(6);
                 } else  if("122".equals(integer.toString())){
-                    integers.add(121);
-                    integers.add(113);
-                    integers.add(23);
+                    extInstrumentIds.add(121);
+                    extInstrumentIds.add(113);
+                    extInstrumentIds.add(23);
                 }
             }
+            if (CollectionUtils.isNotEmpty(extInstrumentIds)) {
+                integers.addAll(extInstrumentIds);
+            }
 
             List<Integer> instrumentIdsBySubjectId = instrumentService.getInstrumentIdsBySubjectId(StringUtils.join(integers,","));
             if (CollectionUtils.isNotEmpty(instrumentIdsBySubjectId)) {