mirror of
https://github.com/halejohn/Cloudreve.git
synced 2026-01-26 09:34:57 +08:00
Fix: unique index check failed due to soft delete
This commit is contained in:
@@ -123,7 +123,7 @@ func RemoveFilesWithSoftLinks(files []File) ([]File, error) {
|
||||
|
||||
// DeleteFileByIDs 根据给定ID批量删除文件记录
|
||||
func DeleteFileByIDs(ids []uint) error {
|
||||
result := DB.Where("id in (?)", ids).Delete(&File{})
|
||||
result := DB.Where("id in (?)", ids).Unscoped().Delete(&File{})
|
||||
return result.Error
|
||||
}
|
||||
|
||||
|
||||
@@ -52,7 +52,7 @@ func GetRecursiveChildFolder(dirs []string, uid uint) ([]Folder, error) {
|
||||
|
||||
// DeleteFolderByIDs 根据给定ID批量删除目录记录
|
||||
func DeleteFolderByIDs(ids []uint) error {
|
||||
result := DB.Where("id in (?)", ids).Delete(&Folder{})
|
||||
result := DB.Where("id in (?)", ids).Unscoped().Delete(&Folder{})
|
||||
return result.Error
|
||||
}
|
||||
|
||||
@@ -62,14 +62,8 @@ func DeleteFolderByIDs(ids []uint) error {
|
||||
|
||||
// MoveFileTo 将此目录下的文件递归移动至dstFolder
|
||||
func (folder *Folder) MoveFileTo(files []string, dstFolder *Folder) error {
|
||||
// 生成绝对路径
|
||||
fullFilePath := make([]string, len(files))
|
||||
for i := 0; i < len(files); i++ {
|
||||
fullFilePath[i] = path.Join(folder.PositionAbsolute, files[i])
|
||||
}
|
||||
|
||||
// 更改顶级要移动文件的父目录指向
|
||||
err := DB.Model(File{}).Where("dir in (?) and user_id = ?", fullFilePath, folder.OwnerID).
|
||||
err := DB.Model(File{}).Where("dir in (?) and user_id = ?", folder.PositionAbsolute, folder.OwnerID).
|
||||
Update(map[string]interface{}{
|
||||
"folder_id": dstFolder.ID,
|
||||
"dir": dstFolder.PositionAbsolute,
|
||||
|
||||
Reference in New Issue
Block a user