分班调整

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

@@ -215,7 +215,14 @@ public class BandingTaskClassServiceImpl extends MPJBaseServiceImpl<BandingTaskC
         List<BandingTaskClass> updNullList = new ArrayList<>();//修改班级
         List<String> errorList = new ArrayList<>();//修改班级
 
-        BandingTask task = bandingTaskMapper.selectById(dtoList.get(0).getBandingTaskId());
+        UpdateBandingClassDto updateBandingClassDto = dtoList.get(0);
+        BandingTask task;
+        if(updateBandingClassDto.getBandingTaskId() == null){
+            BandingTaskClass taskClass = this.getById(updateBandingClassDto.getId());
+            task = bandingTaskMapper.selectById(taskClass.getBandingTaskId());
+        }else{
+            task = bandingTaskMapper.selectById(updateBandingClassDto.getBandingTaskId());
+        }
         List<BaseClass> classList = classMapper.selectList(
                 new QueryWrapper<BaseClass>().lambda()
                         .eq(BaseClass::getDeleteMark, DeleteMark.NODELETE.getCode())
@@ -367,6 +374,8 @@ public class BandingTaskClassServiceImpl extends MPJBaseServiceImpl<BandingTaskC
                 new QueryWrapper<BaseClass>().lambda()
                         .eq(BaseClass::getDeleteMark, DeleteMark.NODELETE.getCode())
                         .eq(BaseClass::getGradeId, bandingTask.getGradeId())
+                        .eq(BaseClass::getIsGraduate, 1)
+                        .eq(BaseClass::getEnrollType, bandingTask.getEnrollType())
         );
         List<BandingTaskClass> insList = new ArrayList<>();//新增班级
         for (BaseClass baseClass : classList) {