From aa981c60d68d3410d4ea580ca6f24abab43cb30f Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期三, 12 八月 2020 17:15:11 +0800
Subject: [PATCH] fix sync person from hik and update phoneNum if change
---
service/userService.go | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/service/userService.go b/service/userService.go
index 71bf37f..dc2f08b 100644
--- a/service/userService.go
+++ b/service/userService.go
@@ -37,7 +37,7 @@
}
var tmpUser models.User
- err := tmpUser.SelectByPhoneNum(phoneNum)
+ err := tmpUser.SelectById(hikPersonId)
fmt.Println("login err:", err)
if err != nil { //鐢ㄦ埛涓嶅瓨鍦�,鍒欐柊澧�
u := models.User{
@@ -88,12 +88,11 @@
return false, nil, errors.New("娉ㄥ唽澶辫触")
}
} else { //鐢ㄦ埛宸插瓨鍦�
- if hikPersonId != tmpUser.Id {
- tmpUser.Id = hikPersonId
- tmpUser.SyncHikPersonId(tmpUser.PhoneNum, hikPersonId)
+ if phoneNum != tmpUser.PhoneNum {
+ tmpUser.UpdatePhoneNum(tmpUser.PhoneNum, hikPersonId)
}
var plateNos = make([]string, 0)
- hikVehicles := carSv.GetVehicleListByPerson(tmpUser.Id)
+ hikVehicles := carSv.GetVehicleListByPerson(hikPersonId)
if hikVehicles != nil {
for _,up := range hikVehicles {
--
Gitblit v1.8.0