|
@@ -646,10 +646,9 @@ public class ImportDataController extends BaseController {
|
|
|
cad.init(inputArray.getJSONObject(i));
|
|
|
cad.input = cad.preHandle(cad.input);
|
|
|
JSONArray beams = cad.getBeams();
|
|
|
- JSONArray walls = cad.getWalls();
|
|
|
+ JSONArray walls = ObjectUtil.isNotNull(cad.getWalls()) ? cad.getWalls() : new JSONArray();
|
|
|
//判断是否需要重复出去墙
|
|
|
AtomicBoolean removeAgain = new AtomicBoolean(false);
|
|
|
- //去除重复的墙
|
|
|
walls = cad.removeRepeat(walls);
|
|
|
|
|
|
JSONArray rooms = cad.getRooms();
|