浏览代码

fix 云教练整合接口cbsDetail

shangke 5 月之前
父节点
当前提交
91f3f8331c

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

@@ -278,6 +278,8 @@ public class StudentManageController extends BaseController {
             Set<Integer> integers = student.getExtSjectNamesMap().keySet();
             Set<Integer> extInstrumentIds = Sets.newConcurrentHashSet();
             for (Integer integer : integers) {
+                extInstrumentIds.add(integer);
+
                 if ("5".equals(integer.toString())) {
                     extInstrumentIds.add(6);
                 } else  if("122".equals(integer.toString())){
@@ -286,11 +288,8 @@ public class StudentManageController extends BaseController {
                     extInstrumentIds.add(23);
                 }
             }
-            if (CollectionUtils.isNotEmpty(extInstrumentIds)) {
-                integers.addAll(extInstrumentIds);
-            }
 
-            List<Integer> instrumentIdsBySubjectId = instrumentService.getInstrumentIdsBySubjectId(StringUtils.join(integers,","));
+            List<Integer> instrumentIdsBySubjectId = instrumentService.getInstrumentIdsBySubjectId(StringUtils.join(extInstrumentIds,","));
             Map<Integer, InstrumentWrapper.Instrument> mapByIds = instrumentService.getMapByIds(instrumentIdsBySubjectId);
             Map<Integer,String> extInstrumentNamesMap = new HashMap<>();
             mapByIds.forEach((k,v)->{