diff --git a/SGGL/FineUIPro.Web/Fakes/RestSharp.fakes b/SGGL/FineUIPro.Web/Fakes/RestSharp.fakes new file mode 100644 index 00000000..a4a6efc3 Binary files /dev/null and b/SGGL/FineUIPro.Web/Fakes/RestSharp.fakes differ diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 0e1de9e3..5cf49ae7 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -1769,6 +1769,7 @@ + @@ -15484,7 +15485,7 @@ 0 - http://localhost:8118/ + http://localhost:3345/ False False diff --git a/SGGL/FineUIPro.Web/indexProject.aspx.cs b/SGGL/FineUIPro.Web/indexProject.aspx.cs index 8d33fb62..fad8ae83 100644 --- a/SGGL/FineUIPro.Web/indexProject.aspx.cs +++ b/SGGL/FineUIPro.Web/indexProject.aspx.cs @@ -604,17 +604,21 @@ namespace FineUIPro.Web { string roleTypes = string.Empty; string roleCNs = string.Empty; - string[] roles = projectUser.RoleId.Split(','); - foreach (var item in roles) + if (projectUser.RoleId != null && projectUser.RoleId.Length > 0) { - var role = BLL.RoleService.GetRoleByRoleId(item); - if (role != null && !string.IsNullOrEmpty(role.RoleType)) + string[] roles = projectUser.RoleId.Split(','); + + foreach (var item in roles) { - roleTypes = role.RoleType + ","; - } - if (role != null && !string.IsNullOrEmpty(role.CNProfessionalIds)) - { - roleCNs = role.CNProfessionalIds + ","; + var role = BLL.RoleService.GetRoleByRoleId(item); + if (role != null && !string.IsNullOrEmpty(role.RoleType)) + { + roleTypes = role.RoleType + ","; + } + if (role != null && !string.IsNullOrEmpty(role.CNProfessionalIds)) + { + roleCNs = role.CNProfessionalIds + ","; + } } } if (roleTypes.Contains(Const.Role_III))