Commit adea8c21 by Juho Juopperi

Merge branch 'restFix' into 'master'

Rest fix

Korjasin ongelman liittyen siihen ettei restistä tulevaan dataan tullut eventUseria matkaan kun luettiin lipputositteen viivakoodi.
2 parents e267ae4b 1ba1213c
...@@ -23,6 +23,8 @@ public class ReaderEventRestPojo { ...@@ -23,6 +23,8 @@ public class ReaderEventRestPojo {
if (re.getPrintedCard().getUser() != null) { if (re.getPrintedCard().getUser() != null) {
eventUser = new EventUserRestPojo(re.getPrintedCard().getUser()); eventUser = new EventUserRestPojo(re.getPrintedCard().getUser());
} }
} else if(re != null && re.getUser() != null) {
eventUser = new EventUserRestPojo(re.getUser());
} }
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!