From a9fa2fe7c72279cecc916bb63cee154cdea67b54 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 03 十一月 2023 16:14:15 +0800
Subject: [PATCH] fix

---
 service/problem/check.go |    3 +++
 service/device.go        |    8 ++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/service/device.go b/service/device.go
index 29f2784..8ad1d23 100644
--- a/service/device.go
+++ b/service/device.go
@@ -4,12 +4,16 @@
 	"apsClient/conf"
 	"apsClient/model"
 	"apsClient/pkg/logx"
+	"github.com/jinzhu/gorm"
 	"os"
 	"strings"
 )
 
 func GetDeviceIDList() (deviceIds []string, err error) {
 	devices, err := model.NewDeviceSearch().SetDeviceMac(conf.Conf.System.DeviceId).FindNotTotal()
+	if err == gorm.ErrRecordNotFound {
+		return nil, nil
+	}
 	if err != nil {
 		return nil, err
 	}
@@ -32,9 +36,9 @@
 	}
 	if len(deviceList) == 0 {
 		conf.Conf.CurrentDeviceID = conf.Conf.System.DeviceId
-		return nil
+	} else {
+		conf.Conf.CurrentDeviceID = deviceList[0]
 	}
-	conf.Conf.CurrentDeviceID = deviceList[0]
 	SetDeviceIDToFile(conf.Conf.CurrentDeviceID)
 	return nil
 }
diff --git a/service/problem/check.go b/service/problem/check.go
index baa1f25..3a602c7 100644
--- a/service/problem/check.go
+++ b/service/problem/check.go
@@ -168,6 +168,9 @@
 
 func (slf *PlcConfig) Check() bool {
 	plcConfig, _ := service.NewDevicePlcService().GetDevicePlc()
+	if plcConfig == nil {
+		return false
+	}
 	if plcConfig.Method == "" {
 		return false
 	}

--
Gitblit v1.8.0