From 1a0a7f736c6d2e7129e7591d40bed67ec7c0f09a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 05 二月 2021 10:47:42 +0800
Subject: [PATCH] 2021-02-05 1.编译冲突修改
---
HDL_ON/DAL/Server/HttpServerRequest.cs | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
old mode 100755
new mode 100644
index 369d632..e3bed2f
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -604,6 +604,8 @@
/// </summary>
public string GetGatewayInfo()
{
+ if (DB_ResidenceData.Instance.HomeGateway == null)
+ return StateCode.NETWORK_ERROR;
Dictionary<string, object> d = new Dictionary<string, object>();
d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
d.Add("gatewayId", DB_ResidenceData.Instance.HomeGateway.gatewayId);
--
Gitblit v1.8.0