Commit 9ec70baf by wyc

JwtToken 添加判断

parent 30a73b0a
...@@ -123,7 +123,7 @@ public ApiResponse<JwtToken> QuickLogin([FromBody] ResetPwdRequest request) ...@@ -123,7 +123,7 @@ public ApiResponse<JwtToken> QuickLogin([FromBody] ResetPwdRequest request)
new Claim(JwtClaimTypes.QuickLogin, EQuickLogin.YES.ToString()), new Claim(JwtClaimTypes.QuickLogin, EQuickLogin.YES.ToString()),
}; };
var roles = _roleService.GetUserRole(user.UserID); var roles = _roleService.GetUserRole(user.UserID);
if (roles?.Any() == true) if (roles?.Any() == true && UnitTypeUtil.Maps.ContainsKey(roles.First().RoleID))
{ {
var unitTypes = UnitTypeUtil.Maps.GetOrAdd(roles.First().RoleID, (key) => Array.Empty<string>()); var unitTypes = UnitTypeUtil.Maps.GetOrAdd(roles.First().RoleID, (key) => Array.Empty<string>());
claims.Add(new Claim(JwtClaimTypes.UnitType, JsonConvert.SerializeObject(unitTypes))); claims.Add(new Claim(JwtClaimTypes.UnitType, JsonConvert.SerializeObject(unitTypes)));
...@@ -298,7 +298,7 @@ public ApiResponse<JwtToken> DemoUsers(int userId) ...@@ -298,7 +298,7 @@ public ApiResponse<JwtToken> DemoUsers(int userId)
new Claim(JwtClaimTypes.PersonnelNumber, user.Login ?? ""), new Claim(JwtClaimTypes.PersonnelNumber, user.Login ?? ""),
}; };
var roles = _roleService.GetUserRole(user.UserID); var roles = _roleService.GetUserRole(user.UserID);
if (roles?.Any() == true) if (roles?.Any() == true && UnitTypeUtil.Maps.ContainsKey(roles.First().RoleID))
{ {
var unitTypes = UnitTypeUtil.Maps.GetOrAdd(roles.First().RoleID, (key) => Array.Empty<string>()); var unitTypes = UnitTypeUtil.Maps.GetOrAdd(roles.First().RoleID, (key) => Array.Empty<string>());
claims.Add(new Claim(JwtClaimTypes.UnitType, JsonConvert.SerializeObject(unitTypes))); claims.Add(new Claim(JwtClaimTypes.UnitType, JsonConvert.SerializeObject(unitTypes)));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment