diff --git a/Data/Access/SearchDAO.cs b/Data/Access/SearchDAO.cs index 62d364645..ad47a588b 100644 --- a/Data/Access/SearchDAO.cs +++ b/Data/Access/SearchDAO.cs @@ -1,7 +1,6 @@ using System; using System.Collections; using System.Collections.Generic; -using System.Diagnostics; using System.Linq; using System.Text; using System.Text.RegularExpressions; @@ -4172,6 +4171,8 @@ namespace BeWo.Data.Access return lCriteria.List().ToList(); } + var customerOids = user.Employee.Employee2CustomerList.Where(employee2Customer => employee2Customer.Customer.Oid.HasValue).Select(employee2Customer => employee2Customer.Customer.Oid.Value).Distinct().ToList(); + // Der ApplicationUser darf die Hilfepläne seiner Teams sehen if(user.CheckForRight(UserRightType.SupportConcept_ViewMyTeams) && (supportConceptFilter == CustomerFilterEnum.TeamCustomer || supportConceptFilter == CustomerFilterEnum.All)) { @@ -4185,7 +4186,7 @@ namespace BeWo.Data.Access return GetAllActiveSupportConceptsByCustomers(teamCustomerOids, true).ToList(); } - var customerOids = user.Employee.Employee2CustomerList.Where(employee2Customer => employee2Customer.Customer.Oid.HasValue).Select(employee2Customer => employee2Customer.Customer.Oid.Value).Distinct().ToList(); + return GetAllActiveSupportConceptsByCustomers(customerOids, true).ToList(); } diff --git a/Host/Web.config b/Host/Web.config index dedb4b51a..da21e12bb 100644 --- a/Host/Web.config +++ b/Host/Web.config @@ -1,52 +1,52 @@  - -
- -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + --> @@ -68,7 +68,8 @@ - + + @@ -87,15 +88,14 @@ - - - - - - - + + + + + + - +