添加床位判断

src/main/java/com/template/controller/WelcomeStudentController.java

@@ -203,6 +203,9 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         //region 宿舍信息
         WelcomeBed bedData = welcomeBedService.queryBedData(isr.getSchool(), isr.getBuildId(), isr.getDormitoryId(), Integer.valueOf(isr.getBed()));
         if (bedData != null) {
+            if(StringUtils.hasText(bedData.getStudentCard())){
+                return CommonResult.fail("当前床位已被他人入住，无法入住");
+            }
             bedData.setStudentCard(isr.getCardId());
             bedData.setCollege(isr.getCollege());
             bedData.setCollegeId(isr.getCollegeId());
@@ -356,6 +359,9 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         List<WelcomeBed> bedDatas = new ArrayList<>();
         WelcomeBed bedData = welcomeBedService.queryBedData(usr.getSchool(), usr.getBuildId(), usr.getDormitoryId(), Integer.valueOf(usr.getBed()));
         if (bedData != null) {//新床位
+            if(StringUtils.hasText(bedData.getStudentCard()) && !bedData.getStudentCard().equals(student.getCardId())){
+                return CommonResult.fail("当前床位已被他人入住，无法入住");
+            }
             if (!StringUtils.hasText(bedData.getStudentCard())) {
                 bedData.setStudentCard(student.getCardId());
                 bedData.setCollege(student.getCollege());