From 60c97371be338da5a707b4c6516e7a2dbe8ea2c9 Mon Sep 17 00:00:00 2001
From: wanghong <309858992@qq.com>
Date: 星期五, 05 一月 2024 18:02:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogLocalServiceImpl.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogLocalServiceImpl.java b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogLocalServiceImpl.java
index 8efad2f..becbc97 100644
--- a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogLocalServiceImpl.java
+++ b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogLocalServiceImpl.java
@@ -26,6 +26,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.attribute.BasicFileAttributes;
+import java.nio.file.attribute.FileTime;
 import java.rmi.ServerException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -96,8 +97,8 @@
 						LocalLogVO localLog = new LocalLogVO();
 						localLog.setLogName(item.getName());
 						localLog.setLogType(getLogType(item.getName()));
-						localLog.setCreateTime(getLastModifiedOrCreatTime(false,logParentPath));
-						localLog.setLastModifier(getLastModifiedOrCreatTime(true,logParentPath));
+						localLog.setCreateTime(getLastModifiedOrCreatTime(false,item.getPath()));
+						localLog.setLastModifier(getLastModifiedOrCreatTime(true,item.getPath()));
 						localLog.setLogPath(logParentPath);
 						String serviceId = getServiceId(logParentPath);
 						localLog.setServiceId(serviceId);
@@ -117,8 +118,8 @@
 						File file = new File(fullPath);
 						if(file.exists()){
 							LocalLogVO localLogVO = new LocalLogVO();
-							localLogVO.setLastModifier(getLastModifiedOrCreatTime(true,fullPath));
-							localLogVO.setCreateTime(getLastModifiedOrCreatTime(false,fullPath));
+							localLogVO.setLastModifier(getLastModifiedOrCreatTime(true,file.getPath()));
+							localLogVO.setCreateTime(getLastModifiedOrCreatTime(false,file.getPath()));
 							localLogVO.setLogPath(fullPath);
 							String serviceId = getServiceId(file.getPath());
 							localLogVO.setServiceId(serviceId);

--
Gitblit v1.9.3