chejianzheng před 4 měsíci
rodič
revize
ce46ff9f67

+ 6 - 2
src/main/java/com/wxxcx/index/WxxcxIndexController.java

@@ -744,8 +744,12 @@ public class WxxcxIndexController<AesException extends Throwable> {
         }
 
         JSONArray res = new JSONArray();
-        res.addAll(JSON.parseArray(devRoomVO.getFurnitures()));
-        res.addAll(JSON.parseArray(devRoomVO.getSub_regions()));
+        if (devRoomVO.getFurnitures() != null && devRoomVO.getFurnitures().length() > 0) {
+            res.addAll(JSON.parseArray(devRoomVO.getFurnitures()));
+        }
+        if (devRoomVO.getSub_regions() != null && devRoomVO.getSub_regions().length() > 0) {
+            res.addAll(JSON.parseArray(devRoomVO.getSub_regions()));
+        }
         // 向前端发送数据
         r.data.put("data", res);
         return r;