优化小区门位置时的错误

WebService/src/main/resources/components/machinePackage/add-machine/addMachine.js

@@ -139,6 +139,7 @@
                 });
             },
             saveMachineInfo: function () {
+                vc.component.addMachineInfo.communityId = vc.getCurrentCommunity().communityId;
                 if (vc.component.addMachineInfo.locationTypeCd != '2000' && vc.component.addMachineInfo.locationTypeCd != '3000') { //大门时直接写 小区ID
                     vc.component.addMachineInfo.locationObjId = vc.component.addMachineInfo.communityId;
                 } else if (vc.component.addMachineInfo.locationTypeCd == '2000') {
@@ -156,10 +157,6 @@
                     return;
                 }
 
-                vc.component.addMachineInfo.communityId = vc.getCurrentCommunity().communityId;
-
-
-
 
                 //不提交数据将数据 回调给侦听处理
                 if (vc.notNull($props.callBackListener)) {

WebService/src/main/resources/components/roomPackage/room-select2/roomSelect2.js

@@ -60,9 +60,9 @@
                             };
                         },
                         processResults: function (data) {
-                            console.log(data, vc.component._filterRoomData(data));
+                            console.log(data, vc.component._filterRoomData(data.rooms));
                             return {
-                                results: vc.component._filterRoomData(data)
+                                results: vc.component._filterRoomData(data.rooms)
                             };
                         },
                         cache: true