Bladeren bron

解决调整床位混合寝室不生效的问题

dzx 1 jaar geleden
bovenliggende
commit
2bb89d906e
1 gewijzigde bestanden met toevoegingen van 8 en 4 verwijderingen
  1. 8 4
      src/main/java/com/xjrsoft/module/room/service/impl/RoomBedServiceImpl.java

+ 8 - 4
src/main/java/com/xjrsoft/module/room/service/impl/RoomBedServiceImpl.java

@@ -436,7 +436,10 @@ public class RoomBedServiceImpl extends MPJBaseServiceImpl<RoomBedMapper, RoomBe
         for (BaseClass baseClass : classList) {
             classIds.add(baseClass.getId());
         }
-        distributeRoomBedDto.setClassIds(classIds);
+        if(!classIds.isEmpty()){
+            distributeRoomBedDto.setClassIds(classIds);
+        }
+
         List<StudentPayStatusVo> studentPayStatusVoList = roomBedMapper.getStudentPayStatus(distributeRoomBedDto);
         Map<Long, Integer> payStatusMap = new HashMap<>();
         for (StudentPayStatusVo statusVo : studentPayStatusVoList) {
@@ -524,9 +527,6 @@ public class RoomBedServiceImpl extends MPJBaseServiceImpl<RoomBedMapper, RoomBe
             setId(dto.getBedId());
             setStudentUserId(dto.getStudentUserId());
         }});
-        if(roomIds.isEmpty()){
-            return true;
-        }
         //如果寝室的人是多个班级,将混合寝室改为是
         List<RoomClassCountVo> classCountVoList = roomMapper.getRoomClassCount(roomIds);
         for (RoomClassCountVo roomClassCountVo : classCountVoList) {
@@ -536,6 +536,10 @@ public class RoomBedServiceImpl extends MPJBaseServiceImpl<RoomBedMapper, RoomBe
                 roomMapper.updateById(updRoom);
             }
         }
+        if(roomIds.isEmpty()){
+            return true;
+        }
+
         return true;
     }
 }