From 6f69ddf1881d875d1d976ede5299b98a707dbe16 Mon Sep 17 00:00:00 2001 From: Björn Hagemeister Date: Wed, 8 Oct 2014 14:54:08 +0200 Subject: Added organizationId to DbUser. --- src/main/java/org/openslx/satellitedaemon/db/DbUser.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/openslx/satellitedaemon/db/DbUser.java b/src/main/java/org/openslx/satellitedaemon/db/DbUser.java index 133adf4..deebd66 100644 --- a/src/main/java/org/openslx/satellitedaemon/db/DbUser.java +++ b/src/main/java/org/openslx/satellitedaemon/db/DbUser.java @@ -7,12 +7,14 @@ public class DbUser public final String firstName; public final String lastName; public final String email; + public final String institution; - public DbUser(String userId, String firstName, String lastName, String email) { + public DbUser(String userId, String firstName, String lastName, String email, String institution) { this.userId = userId; this.firstName = firstName; this.lastName = lastName; this.email = email; + this.institution = institution; } /** @@ -22,7 +24,7 @@ public class DbUser */ public static DbUser getUserById(String userId) { return MySQL.findUniqueOrNull( DbUser.class, "SELECT user.userID, user.Vorname AS firstName, " + - "user.Nachname AS lastName, user.mail AS email" + + "user.Nachname AS lastName, user.mail AS email, user.institution" + "FROM m_user user" + "WHERE userID = ?", userId ); } -- cgit v1.2.3-55-g7522