|
@@ -46,7 +46,9 @@ namespace GreenTree.Nachtragsmanagement.Web.Controllers
|
|
|
var cookieUser = _userHelper.FromCookies();
|
|
var cookieUser = _userHelper.FromCookies();
|
|
|
var dbUser = _userService.GetUserById(cookieUser.Id);
|
|
var dbUser = _userService.GetUserById(cookieUser.Id);
|
|
|
|
|
|
|
|
- if (dbUser.CurrentRole == null || dbUser.CurrentRole.Id != cookieUser.CurrentRole.Id)
|
|
|
|
|
|
|
+ if (dbUser == null) return new RedirectResult("~/login");
|
|
|
|
|
+
|
|
|
|
|
+ if (dbUser.CurrentRole == null || (dbUser.CurrentRole != null && dbUser.CurrentRole.Id != cookieUser.CurrentRole.Id))
|
|
|
dbUser.CurrentRole = cookieUser.CurrentRole;
|
|
dbUser.CurrentRole = cookieUser.CurrentRole;
|
|
|
|
|
|
|
|
var userFunctions = dbUser.CurrentRole.Functions
|
|
var userFunctions = dbUser.CurrentRole.Functions
|