Merge branch 'master' of github.com:thingsboard/thingsboard

8 years ago · ead2468925
1 changed files with 1 additions and 1 deletions
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AuditLogEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AuditLogEntity.java
@ -140,7 +140,7 @@ public class AuditLogEntity extends BaseSqlEntity<AuditLog> implements BaseEntit
            auditLog.setEntityId(EntityIdFactory.getByTypeAndId(entityType.name(), toUUID(entityId).toString()));
        }
        if (userId != null) {
-            auditLog.setUserId(new UserId(toUUID(entityId)));
+            auditLog.setUserId(new UserId(toUUID(userId)));
        }
        auditLog.setEntityName(this.entityName);
        auditLog.setUserName(this.userName);