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

# Conflicts: # service/userService.go
重写确认部分
2024-12-15 16:27:17 +08:00 · 2024-12-15 16:26:33 +08:00 · 2024-12-15 16:25:18 +08:00
1 changed files with 1 additions and 2 deletions
--- a/service/userService.go
+++ b/service/userService.go
@ -269,8 +269,7 @@ func ConfirmSyncUserData(device string, data proto.UserSyncConfirm) error {

 	}

-	if len(data.Delete) == 0 {
-
+	if len(data.Delete) > 0 {
 		var ids_delete []string
 		for _, v := range data.Delete {
 			ids_delete = append(ids_delete, strconv.Itoa(int(v.ID)))
Author	SHA1	Message	Date
junleea	4c9616202d	Merge branch 'refs/heads/feat-user-sync' # Conflicts: # service/userService.go	2024-12-15 16:27:17 +08:00
junleea	203559ed82	重写确认部分	2024-12-15 16:26:33 +08:00
junleea	61a94ec047	重写确认部分	2024-12-15 16:25:18 +08:00