From 067c4ccfe2ca367ba2a9b10ddd9c87b14a2a1bd9 Mon Sep 17 00:00:00 2001
From: junleea <354425203@qq.com>
Date: Sun, 15 Dec 2024 16:38:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BF=AE=E6=94=B9=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=9C=AA=E6=B7=BB=E5=8A=A0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dao/user.go            | 13 +++++++------
 service/userService.go | 11 ++++++++++-
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/dao/user.go b/dao/user.go
index 0bf4bec..5f10bbe 100644
--- a/dao/user.go
+++ b/dao/user.go
@@ -84,7 +84,7 @@ func UpdateUserByID(id int, name, password, email string) {
 }
 
 // 管理员修改用户信息
-func UpdateUserByID2(id int, req proto.UpdateUserInfoReq) {
+func UpdateUserByID2(id int, req proto.UpdateUserInfoReq) error {
 	updateData := make(map[string]interface{})
 	updateData["Name"] = req.Username
 	updateData["Age"] = req.Age
@@ -97,16 +97,17 @@ func UpdateUserByID2(id int, req proto.UpdateUserInfoReq) {
 	updateData["CIDFunc"] = req.CIDFunc
 	updateData["Avatar"] = req.Avatar
 	updateData["Gender"] = req.Gender
-	DB.Model(&User{}).Where("id =?", id).Updates(updateData)
+	res := DB.Model(&User{}).Where("id =?", id).Updates(updateData)
+	if res.Error != nil {
+		return res.Error
+	}
+	return nil
 }
 
 // 用户修改自己的信息
 func UpdateUserByID3(id int, req proto.UpdateUserInfoReq) error {
 	res := DB.Model(&User{}).Where("id = ?", id).Updates(User{Name: req.Username, Age: req.Age, Avatar: req.Avatar, Gender: req.Gender})
-	if res.Error != nil {
-		return res.Error
-	}
-	return nil
+	return res.Error
 }
 
 // 用户数据同步-添加
diff --git a/service/userService.go b/service/userService.go
index e38c059..41cfb00 100644
--- a/service/userService.go
+++ b/service/userService.go
@@ -64,12 +64,21 @@ func UpdateUser(user_id int, req proto.UpdateUserInfoReq) (int, error) {
 		if err == nil {
 			err2 := setSyncUserDataSet("update", user_id)
 			if err2 != nil {
+				fmt.Println("set sync user data set error:", err2)
 				return user_id, nil
 			}
 		}
 		return user_id, err
 	} else if cur_user.Role == "admin" {
-		dao.UpdateUserByID2(req.ID, req)
+		err := dao.UpdateUserByID2(req.ID, req)
+		if err == nil {
+			//添加修改用户信息到同步列表
+			err2 := setSyncUserDataSet("update", req.ID)
+			if err2 != nil {
+				fmt.Println("set sync user data set error:", err2)
+				return req.ID, nil
+			}
+		}
 		return req.ID, nil
 	} else {
 		return 0, nil