From 9408bc383173ce743df6411caa03a50c1a9ef21f Mon Sep 17 00:00:00 2001
From: junleea <354425203@qq.com>
Date: Mon, 16 Dec 2024 20:51:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dao/user.go | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/dao/user.go b/dao/user.go
index 32ef884..87f64ea 100644
--- a/dao/user.go
+++ b/dao/user.go
@@ -113,7 +113,10 @@ func UpdateUserByID3(id int, req proto.UpdateUserInfoReq) error {
 // 用户数据同步-添加
 func AddUserSync(req proto.UserAddOrUpdate) uint {
 	res := DB.Exec("insert into users (id, created_at, updated_at, deleted_at, name, age, email, password,gender,role,redis,run,upload,video_func,device_func,cid_func,avatar,create_time,update_time) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)", req.ID, req.CreatedAt, req.UpdatedAt, req.DeletedAt, req.Name, req.Age, req.Email, req.Password, req.Gender, req.Role, req.Redis, req.Run, req.Upload, req.VideoFunc, req.DeviceFunc, req.CIDFunc, req.Avatar, req.CreateTime, req.UpdateTime)
-	res = DB.Debug().Exec("update users set created_at=null where id=?", req.ID)
+	if res.Error != nil {
+		return 0
+	}
+	res = DB.Debug().Exec("update users set deleted_at=null where id=?", req.ID)
 	if res.Error != nil {
 		return 0
 	}
@@ -124,7 +127,10 @@ func AddUserSync(req proto.UserAddOrUpdate) uint {
 func UpdateUserSync(req proto.UserAddOrUpdate) uint {
 	//事务
 	res := DB.Exec("update users set created_at=?, updated_at=?, deleted_at=?, name=?, age=?, email=?, password=?,gender=?,role=?,redis=?,run=?,upload=?,video_func=?,device_func=?,cid_func=?,avatar=?,create_time=?,update_time=? where id=?", req.CreatedAt, req.UpdatedAt, req.DeletedAt, req.Name, req.Age, req.Email, req.Password, req.Gender, req.Role, req.Redis, req.Run, req.Upload, req.VideoFunc, req.DeviceFunc, req.CIDFunc, req.Avatar, req.CreateTime, req.UpdateTime, req.ID)
-	res = DB.Debug().Exec("update users set created_at=null where id=?", req.ID)
+	if res.Error != nil {
+		return 0
+	}
+	res = DB.Debug().Exec("update users set deleted_at=null where id=?", req.ID)
 	if res.Error != nil {
 		return 0
 	}