From e9f3211de151743551a50586bcf267afdc8719ca Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Mon, 1 Oct 2018 16:24:32 +0200 Subject: [PATCH] MS --- DDUserManager/DDUserManager/frmADImport_Users.vb | 14 +++++++------- DDUserManager/DDUserManager/frmMain.vb | 7 +++++-- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/DDUserManager/DDUserManager/frmADImport_Users.vb b/DDUserManager/DDUserManager/frmADImport_Users.vb index fc1dcc4..df27ea7 100644 --- a/DDUserManager/DDUserManager/frmADImport_Users.vb +++ b/DDUserManager/DDUserManager/frmADImport_Users.vb @@ -28,10 +28,10 @@ Public Class frmADImport_Users For Each user As UserPrincipal In usersForGroup Dim row As TBLOCAL_ADUSERSRow = UserDataSet.TBLOCAL_ADUSERS.NewTBLOCAL_ADUSERSRow() - row.NAME = user.Surname - row.PRENAME = user.GivenName - row.USERNAME = user.SamAccountName - row.EMAIL = user.EmailAddress + row.NAME = IIf((IsDBNull(user.Surname) Or IsNothing(user.Surname)), "", user.Surname) + row.PRENAME = IIf((IsDBNull(user.GivenName) Or IsNothing(user.GivenName)), "", user.GivenName) + row.USERNAME = IIf((IsDBNull(user.SamAccountName) Or IsNothing(user.SamAccountName)), "", user.SamAccountName) + row.EMAIL = IIf((IsDBNull(user.EmailAddress) Or IsNothing(user.EmailAddress)), "", user.EmailAddress) UserDataSet.TBLOCAL_ADUSERS.AddTBLOCAL_ADUSERSRow(row) Next @@ -52,9 +52,9 @@ Public Class frmADImport_Users Dim userRow As TBLOCAL_ADUSERSRow = rowView.Row Dim Username As String = userRow.USERNAME - Dim Prename As String = IIf(IsDBNull(userRow.PRENAME), Nothing, userRow.PRENAME) - Dim Name As String = IIf(IsDBNull(userRow.NAME), Nothing, userRow.NAME) - Dim Email As String = IIf(IsDBNull(userRow.EMAIL), Nothing, userRow.EMAIL) + Dim Prename As String = userRow.PRENAME + Dim Name As String = userRow.NAME + Dim Email As String = userRow.EMAIL If Not ClassData.UserExists(Username) Then diff --git a/DDUserManager/DDUserManager/frmMain.vb b/DDUserManager/DDUserManager/frmMain.vb index 0d8accb..43e3e34 100644 --- a/DDUserManager/DDUserManager/frmMain.vb +++ b/DDUserManager/DDUserManager/frmMain.vb @@ -351,8 +351,11 @@ Public Class frmMain Private Function GetAssignedUsersByGroupId(groupId As Integer) As TBDD_USERDataTable Try Dim dt As New TBDD_USERDataTable() - TBDD_USERTableAdapter.FillByGroupId(dt, groupId) - + Dim sql = String.Format("SELECT T1.GUID, T1.PRENAME, T1.NAME, T1.USERNAME, T1.SHORTNAME, T1.EMAIL, T1.LANGUAGE, T1.COMMENT, T1.DATE_FORMAT, T1.ADDED_WHO, T1.ADDED_WHEN, T1.CHANGED_WHO, T1.CHANGED_WHEN " & +"FROM TBDD_USER AS T1 INNER JOIN " & +" TBDD_GROUPS_USER AS T2 ON T1.GUID = T2.USER_ID " & +"WHERE (T2.GROUP_ID = {0})", groupId) + clsDatabase.Return_Datatable(sql) Return dt Catch ex As Exception ShowErrorMessage($"Error in GetAssignedUsersByGroupId with groupId {groupId}", ex)