bug修复

src/main/java/com/xjrsoft/module/banding/service/impl/BandingTaskServiceImpl.java

@@ -183,8 +183,14 @@ public class BandingTaskServiceImpl extends MPJBaseServiceImpl<BandingTaskMapper
 
             Map<Long, Integer> majorLimitMap = new HashMap<>();
             for (Long majorSetId : majorClassStudentCount.keySet()) {
-                Integer majorClassNumber = majorClassStudentCount.get(majorSetId);
-                Integer majorStudentNumber = majorStudentCount.get(majorSetId);
+                int majorClassNumber = 0;
+                if(majorClassStudentCount.get(majorSetId) != null){
+                    majorClassNumber = majorClassStudentCount.get(majorSetId);
+                }
+                int majorStudentNumber = 0;
+                if(majorStudentCount.get(majorSetId) != null){
+                    majorStudentNumber = majorStudentCount.get(majorSetId);
+                }
                 Integer classCount = majorClassCount.get(majorSetId);
                 if(majorStudentNumber < majorClassNumber){//报名人数小于班级人数
                     Integer classLimtCount = majorStudentNumber / classCount;

src/main/java/com/xjrsoft/module/banding/vo/BandingTaskClassSureListVo.java

@@ -39,7 +39,7 @@ public class BandingTaskClassSureListVo {
     private Integer number;
 
     @ApiModelProperty("是否是订单班")
-    private Integer isOrdeClass;
+    private Integer isOrderClass;
 
     @ApiModelProperty("男生人数")
     private Integer maleCount;

src/main/java/com/xjrsoft/module/student/service/impl/BaseNewStudentServiceImpl.java

@@ -91,7 +91,8 @@ public class BaseNewStudentServiceImpl extends MPJBaseServiceImpl<BaseNewStudent
         }
 
         //查询专业数据
-        Map<String, Long> majorSetMap = majorSetService.list().stream().collect(Collectors.toMap(BaseMajorSet::getName, BaseMajorSet::getId));
+        Map<String, Long> majorSetMap = majorSetService.list(new QueryWrapper<BaseMajorSet>().lambda().eq(BaseMajorSet::getDeleteMark, 0))
+                .stream().collect(Collectors.toMap(BaseMajorSet::getName, BaseMajorSet::getId));
         
         //查询已有的学生数据
         List<BaseNewStudent> baseNewStudents = this.baseMapper.selectList(