Browse Source

动态添加床位

夏文涛 1 year ago
parent
commit
b8c0727ae6

+ 8 - 9
src/main/java/com/template/controller/WelcomeDormitoryController.java

@@ -166,10 +166,11 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
             return CommonResult.fail("编辑失败");
         }
 
+        ArrayList<WelcomeBed> welcomeBeds = new ArrayList<>();
         //动态修改床位
         List<WelcomeBed> list = welcomeBedService.listWelcomeBed(welcomeDormitory.getId());
         if (list != null && list.size() > 0) {
-            ArrayList<WelcomeBed> welcomeBeds = new ArrayList<>();
+
             //动态生成床位
             Integer bedNumber = welcomeDormitory.getBedNumber();
             for (int i = 1; i <= bedNumber; i++) {
@@ -203,7 +204,6 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
         } else {
             //动态生成床位
             Integer bedNumber = welcomeDormitory.getBedNumber();
-            ArrayList<WelcomeBed> welcomeBeds = new ArrayList<>();
             for (int i = 1; i <= bedNumber; i++) {
                 WelcomeBed welcomeBed = new WelcomeBed();
                 welcomeBed.setNumber(i);
@@ -217,16 +217,15 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
                 welcomeBed.setIsCheck(0);
                 welcomeBeds.add(welcomeBed);
             }
-            if (welcomeBeds != null && welcomeBeds.size() > 0) {
-                boolean insertBeds = welcomeBedService.saveBatch(welcomeBeds);
-                if (!insertBeds) {
-                    return CommonResult.fail("编辑失败");
-                }
-            }
-
 
         }
 
+        if (welcomeBeds != null && welcomeBeds.size() > 0) {
+            boolean insertBeds = welcomeBedService.saveBatch(welcomeBeds);
+            if (!insertBeds) {
+                return CommonResult.fail("编辑失败");
+            }
+        }
         return CommonResult.ok();
     }