Merge branch 'master' into dev/数据库统合

2024-12-27 17:14:48 +08:00
parent 7751eae913 f2c7a06516
commit a4af7eb9a1
3 changed files with 13 additions and 5 deletions
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/LogServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/LogServiceImpl.java
@@ -24,7 +24,7 @@ public class LogServiceImpl implements ILogService {
    @Override
    public List<LogFileInfo> queryList(String query, String startTime, String endTime) {
        File logFile = getLogDir();
-        if (logFile == null && !logFile.exists()) {
+        if (logFile == null || !logFile.exists()) {
            throw new ControllerException(ErrorCode.ERROR100.getCode(), "获取日志文件目录失败");
        }
        File[] files = logFile.listFiles();