search rfid tag also from barcode

code/MoyaBeans/ejbModule/fi/codecrew/moya/facade/PrintedCardFacade.java

@@ -40,7 +40,10 @@ public class PrintedCardFacade extends IntegerPkGenericFacade<PrintedCard> {
 		CriteriaQuery<PrintedCard> cq = cb.createQuery(PrintedCard.class);
 		CriteriaQuery<PrintedCard> cq = cb.createQuery(PrintedCard.class);
 		Root<PrintedCard> root = cq.from(PrintedCard.class);
 		Root<PrintedCard> root = cq.from(PrintedCard.class);
 
 
-		cq.where(cb.equal(root.get(PrintedCard_.rfidUid), uid),
+		cq.where(
+				cb.or(
+						cb.equal(root.get(PrintedCard_.barcode), uid),
+						cb.equal(root.get(PrintedCard_.rfidUid), uid)),
 				cb.equal(root.get(PrintedCard_.event), eventbean.getCurrentEvent()));
 				cb.equal(root.get(PrintedCard_.event), eventbean.getCurrentEvent()));
 
 
 		return getSingleNullableResult(getEm().createQuery(cq));
 		return getSingleNullableResult(getEm().createQuery(cq));