Merge branch 'dev' into pre

zhongzheng-system/src/main/java/com/zhongzheng/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -1339,14 +1339,14 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
     public void sendMockSubscribe(UserQueryBo bo) {
         List<ClassGradeVo> classGradeVos = iClassGradeService.listGradeSubjects();
         List<MockApplyVo> mockApplyVos = iMockApplyService.listSubjects();
-        List<Long> gradeIds = new ArrayList<>();
+        Set<Long> gradeIds = new HashSet<>();
         classGradeVos.forEach(classGradeVo -> {
             if (Validator.isNotEmpty(classGradeVo.getSubjectIds())) {
                 String[] subjectId = classGradeVo.getSubjectIds().split(",");
                 List<String> subjectIds = Arrays.asList(subjectId);
                 if (mockApplyVos != null && mockApplyVos.size() > 0) {
                     for (MockApplyVo mockApplyVo : mockApplyVos) {
-                        if (subjectIds.contains(mockApplyVo.getSubjectId())) {
+                        if (subjectIds.contains(mockApplyVo.getSubjectId().toString())) {
                             gradeIds.add(classGradeVo.getGradeId());
                         }
                     }