Add Driver column to Trip report template

2 files changed, 3 insertions, 1 deletions

diff --git a/src/org/traccar/reports/ReportUtils.java b/src/org/traccar/reports/ReportUtils.java
index 3a177300b..bc58d28df 100644
--- a/src/org/traccar/reports/ReportUtils.java
+++ b/src/org/traccar/reports/ReportUtils.java
@@ -114,7 +114,9 @@ public final class ReportUtils {
     public static String findDriverName(String driverUniqueId) {
         if (driverUniqueId != null && Context.getDriversManager() != null) {
             Driver driver = Context.getDriversManager().getDriverByUniqueId(driverUniqueId);
-            return driver != null ? driver.getName() : driverUniqueId;
+            if (driver != null) {
+                return driver.getName();
+            }
         }
         return null;
     }
diff --git a/templates/export/trips.xlsx b/templates/export/trips.xlsx
index 0e0ab4494..4a6734850 100644
--- a/templates/export/trips.xlsx
+++ b/templates/export/trips.xlsx