From 9820a1e1f305d77129a2e7c5bd17fbdd402e0014 Mon Sep 17 00:00:00 2001
From: MuGu <94156510@qq.com>
Date: Fri, 1 Sep 2023 18:46:20 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81Fix=20"Scan=20Disk"=20user=5Fuuid=20e?=
 =?UTF-8?q?rror=20that=20causes=20WebDAV=20unable=20to=20display=20scan=20?=
 =?UTF-8?q?list.=202=E3=80=81Fix=20the=20problem=20of=20abnormality=20when?=
 =?UTF-8?q?=20scanning=20non-existent=20folders.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 code/rest/matter_dao.go   | 7 ++++---
 code/rest/task_service.go | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/code/rest/matter_dao.go b/code/rest/matter_dao.go
index 8075198..1f2c5ef 100644
--- a/code/rest/matter_dao.go
+++ b/code/rest/matter_dao.go
@@ -518,9 +518,10 @@ func (this *MatterDao) Delete(matter *Matter) {
 		//delete from db.
 		db := core.CONTEXT.GetDB().Delete(&matter)
 		this.PanicError(db.Error)
-
-		//delete dir from disk.
-		util.DeleteEmptyDir(matter.AbsolutePath())
+		if util.PathExists(matter.AbsolutePath()) {
+			//delete dir from disk.
+			util.DeleteEmptyDir(matter.AbsolutePath())
+		}
 
 	} else {
 
diff --git a/code/rest/task_service.go b/code/rest/task_service.go
index ae84857..e9ca22d 100644
--- a/code/rest/task_service.go
+++ b/code/rest/task_service.go
@@ -133,9 +133,10 @@ func (this *TaskService) doScanTask() {
 				this.logger.Info("scan spaceName = %s", space.Name)
 
 				//find admin as operator.
-				adminUser := this.userDao.FindAnAdmin()
-				this.matterService.DeleteByPhysics(request, adminUser, space)
-				this.matterService.ScanPhysics(request, adminUser, space)
+				// adminUser := this.userDao.FindAnAdmin()
+				user := this.userDao.FindByUuid(space.UserUuid)
+				this.matterService.DeleteByPhysics(request, user, space)
+				this.matterService.ScanPhysics(request, user, space)
 
 			})