更新床位导入接口

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

@@ -404,7 +404,7 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
 
                         //楼栋
                         if (wbils != null && wbils.size() > 0) {
-                            Optional<WelcomeBuild> oBuild = wbils.stream().filter(e -> e.getBuild().equals(build)).findFirst();
+                            Optional<WelcomeBuild> oBuild = wbils.stream().filter(e -> e.getSchool().equals(school) && e.getBuild().equals(build)).findFirst();
                             if (oBuild != null && oBuild.isPresent()) {
                                 bedData.setBuild(build);
                                 bedData.setBuildId(oBuild.get().getId());
@@ -416,7 +416,8 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
 
                         //寝室
                         if (wds != null && wds.size() > 0) {
-                            Optional<WelcomeDormitory> oDormitory = wds.stream().filter(e -> e.getDormitory().equals(dormitory)).findFirst();
+                            Optional<WelcomeDormitory> oDormitory = wds.stream().filter(e ->e.getSchool().equals(school) && e.getBuild().equals(build)
+                                    && e.getDormitory().equals(dormitory)).findFirst();
                             if (oDormitory != null && oDormitory.isPresent()) {
                                 if (!oDormitory.get().getSex().equals(sex)) {
                                     int h=rowNum+1;
@@ -590,13 +591,13 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
                                 bedData.setSchool(school);
                             } else {
                                 int h=rowNum+1;
-                                return CommonResult.fail("第" + h + "行,不存在该校区");
+                                return CommonResult.fail("第" +h+ "行,不存在该校区");
                             }
                         }
 
                         //楼栋
                         if (wbils != null && wbils.size() > 0) {
-                            Optional<WelcomeBuild> oBuild = wbils.stream().filter(e -> e.getBuild().equals(build)).findFirst();
+                            Optional<WelcomeBuild> oBuild = wbils.stream().filter(e -> e.getSchool().equals(school) && e.getBuild().equals(build)).findFirst();
                             if (oBuild != null && oBuild.isPresent()) {
                                 bedData.setBuild(build);
                                 bedData.setBuildId(oBuild.get().getId());
@@ -608,7 +609,8 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
 
                         //寝室
                         if (wds != null && wds.size() > 0) {
-                            Optional<WelcomeDormitory> oDormitory = wds.stream().filter(e -> e.getDormitory().equals(dormitory)).findFirst();
+                            Optional<WelcomeDormitory> oDormitory = wds.stream().filter(e ->e.getSchool().equals(school) && e.getBuild().equals(build)
+                                    && e.getDormitory().equals(dormitory)).findFirst();
                             if (oDormitory != null && oDormitory.isPresent()) {
                                 if (!oDormitory.get().getSex().equals(sex)) {
                                     int h=rowNum+1;