Merge branch 'refs/heads/feat-user-sync'
# Conflicts: # service/userService.go
This commit is contained in:
commit
4c9616202d
|
|
@ -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
|
var ids_delete []string
|
||||||
for _, v := range data.Delete {
|
for _, v := range data.Delete {
|
||||||
ids_delete = append(ids_delete, strconv.Itoa(int(v.ID)))
|
ids_delete = append(ids_delete, strconv.Itoa(int(v.ID)))
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue