更新！

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/device/GateWayInfoService.java

@@ -392,7 +392,7 @@ public class GateWayInfoService extends SuperService {
             } else {
             }
             gateWay2Device.setGateWayInfo(gateWayInfo);
-            gateWay2Device.setGateWayId(gateWayInfo.getGateWayId());
+            gateWay2Device.setGateWayId(gateWayInfo != null ? gateWayInfo.getGateWayId() : "");
             gateWay2Device.setDeviceInfo(deviceInfo);
             gateWay2Device.setDeviceId(deviceInfo.getDeviceId());