Merge branch 'refs/heads/feat-user-sync'

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,17 +97,18 @@ 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
-}
 
 // 用户数据同步-添加
 func AddUserSync(req proto.UserAddOrUpdate) uint {

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