From 2cedb574c22cf2f77418929e79f23ace0a7e7ac6 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 29 四月 2024 10:05:12 +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 | 10 ++++++----
1 files changed, 6 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 becbc97..8e91b71 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
@@ -85,7 +85,7 @@
*/
@Override
public List<LocalLogVO> getSystemLogList(String logParentPath) {
- List<LocalLogVO> localLogsVO = new ArrayList<>();
+ List<LocalLogVO> localLogsVOS = new ArrayList<>();
// 涓嶄负绌鸿鏄庢槸鍔犺浇褰撳墠杩欎釜鏈嶅姟璺緞涓嬬殑鏃ュ織鏂囦欢
if(Func.isNotEmpty(logParentPath)){
File file = new File(logParentPath);
@@ -104,7 +104,7 @@
localLog.setServiceId(serviceId);
localLog.setServiceName(getServiceName(serviceId));
localLog.setHasChildren(false);
- localLogsVO.add(localLog);
+ localLogsVOS.add(localLog);
});
}
}
@@ -128,13 +128,15 @@
localLogVO.setLogType(serviceName+"鏃ュ織鐖剁洰褰�");
localLogVO.setLogName(serviceName+"鏃ュ織鐖剁洰褰�");
localLogVO.setHasChildren(true);
- localLogsVO.add(localLogVO);
+ localLogsVOS.add(localLogVO);
}
}
});
}
}
- return localLogsVO;
+ // 瀵规棩蹇楄繘琛岄檷搴忔帓搴�
+ List<LocalLogVO> resLocalLogVOS = localLogsVOS.stream().sorted(Comparator.comparing(LocalLogVO::getLastModifier).reversed()).collect(Collectors.toList());
+ return resLocalLogVOS;
}
/**
--
Gitblit v1.9.3