Browse Source

bug修复

dzx 1 year ago
parent
commit
8105fa567c

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

@@ -283,8 +283,8 @@ public class BandingTaskServiceImpl extends MPJBaseServiceImpl<BandingTaskMapper
                 if(!Objects.equals(taskClass.getMajorSetId(), newStudent.getFirstAmbitionId()) && !Objects.equals(taskClass.getMajorSetId(), newStudent.getSecondAmbitionId())){
                     continue;
                 }
-                //判断该班性别是否已满
-                if(ruleCodes.contains("BR0001")){
+                //判断该班性别是否已满,如果设置了排序,即使性别满了班级人数没满继续分班
+                if(ruleCodes.contains("BR0001") && taskClass.getSortCode() == null){
                     if(GenderDictionaryEnum.MALE.getCode().equals(newStudent.getGender()) && maleList.size() == maleCount){
                         continue;
                     }else if(GenderDictionaryEnum.FEMALE.getCode().equals(newStudent.getGender()) && femaleList.size() == femaleCount){