diff --git a/UID/Dienstplan/usrcntlSessions.vb b/UID/Dienstplan/usrcntlSessions.vb index c3f950c..4f076c4 100644 --- a/UID/Dienstplan/usrcntlSessions.vb +++ b/UID/Dienstplan/usrcntlSessions.vb @@ -117,13 +117,22 @@ If mitarbeiter.mit_AliasAD_Username IsNot Nothing AndAlso mitarbeiter.mit_AliasAD_Username <> "" AndAlso mitarbeiter.mit_AliasAD_Domain IsNot Nothing AndAlso mitarbeiter.mit_AliasAD_Domain <> "" Then + Dim whereLogin As String = "([BenutzerAnmeldeName] = '" & mitarbeiter.mit_AliasAD_Domain & "\" & mitarbeiter.mit_AliasAD_Username & "'" + + If mitarbeiter.mit_AliasAD_Username2 IsNot Nothing AndAlso mitarbeiter.mit_AliasAD_Username2 <> "" AndAlso mitarbeiter.mit_AliasAD_Domain2 IsNot Nothing AndAlso mitarbeiter.mit_AliasAD_Domain2 <> "" Then + whereLogin &= " OR [BenutzerAnmeldeName] = '" & mitarbeiter.mit_AliasAD_Domain2 & "\" & mitarbeiter.mit_AliasAD_Username2 & "')" + Else + whereLogin &= ")" + End If + + Dim SQL_SESSION_TS = "SELECT 'TS/PC','-','-',[TSServer],[BenutzerAnmeldeName],[LogOn_datetime],[LogOff_datetime] FROM [Doku].[dbo].[TbL_LogOnLogOffLog] - where [BenutzerAnmeldeName] = '" & mitarbeiter.mit_AliasAD_Domain & "\" & mitarbeiter.mit_AliasAD_Username & "' and cast([LogOn_datetime] as Date) between '" & von.ToShortDateString & "' and '" & bis.ToShortDateString & "'" + where " & whereLogin & " and cast([LogOn_datetime] as Date) between '" & von.ToShortDateString & "' and '" & bis.ToShortDateString & "'" SQL_String = " select * FROM ( " & SQL_SESSIONS & " UNION ALL " & SQL_SESSION_TS & ") TEMP order by TEMP.sess_login" - Else - SQL_String = " select * FROM ( " & SQL_SESSIONS & ") TEMP order by TEMP.sess_login" + Else + SQL_String = " select * FROM ( " & SQL_SESSIONS & ") TEMP order by TEMP.sess_login" End If