diff --git a/Marco.Pms.Model/ViewModels/Employee/EmployeeProfile.cs b/Marco.Pms.Model/ViewModels/Employee/EmployeeProfile.cs index 33e17b5..54966b5 100644 --- a/Marco.Pms.Model/ViewModels/Employee/EmployeeProfile.cs +++ b/Marco.Pms.Model/ViewModels/Employee/EmployeeProfile.cs @@ -1,15 +1,10 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Marco.Pms.Model.ViewModels.Employee +namespace Marco.Pms.Model.ViewModels.Employee { public class EmployeeProfile { public EmployeeVM EmployeeInfo { get; set; } public string[] Projects { get; set; } - public string[] FeaturePermissions { get; set; } + public string[] FeaturePermissions { get; set; } + public string[] Features { get; set; } } } diff --git a/Marco.Pms.Services/Controllers/UserController.cs b/Marco.Pms.Services/Controllers/UserController.cs index b808a3c..c8ff79c 100644 --- a/Marco.Pms.Services/Controllers/UserController.cs +++ b/Marco.Pms.Services/Controllers/UserController.cs @@ -43,7 +43,8 @@ namespace MarcoBMS.Services.Controllers List featurePermission = await _rolesHelper.GetFeaturePermissionByEmployeeID(emp.Id); string[] projectsId = []; - if (featurePermission != null && featurePermission.Exists(c => c.FeatureId.ToString() == "53176ebf-c75d-42e5-839f-4508ffac3def")) { + /* User with permission manage project can see all projects */ + if (featurePermission != null && featurePermission.Exists(c => c.Id.ToString() == "172fc9b6-755b-4f62-ab26-55c34a330614")) { List projects = await _projectsHelper.GetAllProjectByTanentID(emp.TenantId); projectsId = projects.Select(c=>c.Id.ToString()).ToArray(); } @@ -59,9 +60,11 @@ namespace MarcoBMS.Services.Controllers { EmployeeInfo = employeeVM, Projects = projectsId, - FeaturePermissions = featurePermission.Select(c => c.FeatureId.ToString()).ToArray(), + FeaturePermissions = featurePermission.Select(c => c.Id.ToString()).Distinct().ToArray(), + Features = featurePermission.Select(c => c.FeatureId.ToString()).Distinct().ToArray(), }; + return Ok(profile); } }