更新导入床位接口

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

@@ -442,24 +442,29 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
                         }
 
 //                        专业
-                        Optional<WelcomeOrg> omwo = wos.stream().filter(e -> e.getName().equals(major) && e.getParentId().equals(owo.get().getId())).findFirst();
-                        if (omwo != null && omwo.isPresent()) {
-                            bedData.setMajor(major);
-                            bedData.setMajorId(omwo.get().getId());
-                        } else {
-                            int h = rowNum + 1;
-                            return CommonResult.fail("第" + h + "行,不存在该专业");
-                        }
+                        if (ObjectUtils.isNotEmpty(major) && ObjectUtils.isNotEmpty(classstr)) {
+                            Optional<WelcomeOrg> omwo = wos.stream().filter(e -> e.getName().equals(major) && e.getParentId().equals(owo.get().getId())).findFirst();
+                            if (omwo != null && omwo.isPresent()) {
+                                bedData.setMajor(major);
+                                bedData.setMajorId(omwo.get().getId());
+                            } else {
+                                int h = rowNum + 1;
+                                return CommonResult.fail("第" + h + "行,不存在该专业");
+                            }
+
+                            //                        班级
+                            Optional<WelcomeOrg> ocwo = wos.stream().filter(e -> e.getName().equals(classstr) && e.getParentId().equals(omwo.get().getId())).findFirst();
+                            if (ocwo != null && ocwo.isPresent()) {
+                                bedData.setClassstr(classstr);
+                                bedData.setClassstrId(ocwo.get().getId());
+                            } else {
+                                int h = rowNum + 1;
+                                return CommonResult.fail("第" + h + "行,不存在该班级");
+                            }
 
-//                        班级
-                        Optional<WelcomeOrg> ocwo = wos.stream().filter(e -> e.getName().equals(classstr) && e.getParentId().equals(omwo.get().getId())).findFirst();
-                        if (ocwo != null && ocwo.isPresent()) {
-                            bedData.setClassstr(classstr);
-                            bedData.setClassstrId(ocwo.get().getId());
-                        } else {
-                            int h = rowNum + 1;
-                            return CommonResult.fail("第" + h + "行,不存在该班级");
                         }
+
+
                         //endregion
 
                         bedData.setIsCheck(0);
@@ -637,23 +642,25 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
                         }
 
 //                        专业
-                        Optional<WelcomeOrg> omwo = wos.stream().filter(e -> e.getName().equals(major) && e.getParentId().equals(owo.get().getId())).findFirst();
-                        if (omwo != null && omwo.isPresent()) {
-                            bedData.setMajor(major);
-                            bedData.setMajorId(omwo.get().getId());
-                        } else {
-                            int h = rowNum + 1;
-                            return CommonResult.fail("第" + h + "行,不存在该专业");
-                        }
+                        if (ObjectUtils.isNotEmpty(major) && ObjectUtils.isNotEmpty(classstr)) {
+                            Optional<WelcomeOrg> omwo = wos.stream().filter(e -> e.getName().equals(major) && e.getParentId().equals(owo.get().getId())).findFirst();
+                            if (omwo != null && omwo.isPresent()) {
+                                bedData.setMajor(major);
+                                bedData.setMajorId(omwo.get().getId());
+                            } else {
+                                int h = rowNum + 1;
+                                return CommonResult.fail("第" + h + "行,不存在该专业");
+                            }
 
 //                        班级
-                        Optional<WelcomeOrg> ocwo = wos.stream().filter(e -> e.getName().equals(classstr) && e.getParentId().equals(omwo.get().getId())).findFirst();
-                        if (ocwo != null && ocwo.isPresent()) {
-                            bedData.setClassstr(classstr);
-                            bedData.setClassstrId(ocwo.get().getId());
-                        } else {
-                            int h = rowNum + 1;
-                            return CommonResult.fail("第" + h + "行,不存在该班级");
+                            Optional<WelcomeOrg> ocwo = wos.stream().filter(e -> e.getName().equals(classstr) && e.getParentId().equals(omwo.get().getId())).findFirst();
+                            if (ocwo != null && ocwo.isPresent()) {
+                                bedData.setClassstr(classstr);
+                                bedData.setClassstrId(ocwo.get().getId());
+                            } else {
+                                int h = rowNum + 1;
+                                return CommonResult.fail("第" + h + "行,不存在该班级");
+                            }
                         }
                         //endregion
 
@@ -1340,16 +1347,16 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
                 String dormitory = bed.getDormitory();
                 if ("16栋".equals(build) || "28栋".equals(build) || "29栋".equals(build)) {
                     vo.setLayoutNumber(2);
-                }else if ("9栋".equals(build)){
+                } else if ("9栋".equals(build)) {
                     if ("105".equals(dormitory)) {
                         vo.setLayoutNumber(3);
-                    }else {
+                    } else {
                         vo.setLayoutNumber(2);
                     }
-                }else if ("12栋".equals(build)){
-                    if ("219".equals(dormitory) || "319".equals(dormitory) || "419".equals(dormitory) || "519".equals(dormitory) || "619".equals(dormitory)){
+                } else if ("12栋".equals(build)) {
+                    if ("219".equals(dormitory) || "319".equals(dormitory) || "419".equals(dormitory) || "519".equals(dormitory) || "619".equals(dormitory)) {
                         vo.setLayoutNumber(5);
-                    }else {
+                    } else {
                         vo.setLayoutNumber(4);
                     }
                 }