Commit 5c827208 authored by Enriko Käsper's avatar Enriko Käsper

Merge branch 'develop' into 'master'

Release: merge 'develop' into 'master' created by Enriko Käsper

See merge request teis/officials-service!39
parents 82bcc3c4 0efd5e36
theGroup=ee.sm.ti.teis
theVersion=1.3.1
commonsVersion=1.5.1
officeApiGatewayVersion=1.5.1
theVersion=1.4.0
commonsVersion=1.6.0
officeApiGatewayVersion=1.6.0
pluginVersion=1.0.1
mapstructVersion=1.3.0.Final
querydslVersion=4.1.3
......@@ -54,7 +54,7 @@ public class OfficialNotifyService {
AuditLogItem auditLogItem = AuditLogItem.builder()
.activityType(UPDATE)
.dataObjectType(OFFICIAL_USERS.name())
.dataObjectId(updatedEntity.getId())
.dataObjectId(updatedEntity.getId().toString())
.build();
auditLogItem.setActivityDescription(messageSource.getAuditlogMessage(auditLogItem, updatedEntity.getIdCode(),
......@@ -71,7 +71,7 @@ public class OfficialNotifyService {
AuditLogItem auditLogItem = AuditLogItem.builder()
.activityType(DELETE)
.dataObjectType(OFFICIAL_USERS.name())
.dataObjectId(entity.getId())
.dataObjectId(entity.getId().toString())
.build();
auditLogItem.setActivityDescription(messageSource.getAuditlogMessage(auditLogItem, composeOfficialFullName(entity),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment