diff --git a/labs/Teacher/Infrastructure/Web/JwtTokenValidator.cs b/labs/Teacher/Infrastructure/Web/JwtTokenValidator.cs index 37434a5c..18389bcc 100644 --- a/labs/Teacher/Infrastructure/Web/JwtTokenValidator.cs +++ b/labs/Teacher/Infrastructure/Web/JwtTokenValidator.cs @@ -29,7 +29,7 @@ namespace Infrastructure.Web { validatedToken = new JwtSecurityTokenHandler().ReadJwtToken(securityToken); var claims = (validatedToken as JwtSecurityToken).Claims.ToList(); - var userName = claims.FirstOrDefault(o => o.Type == ClaimTypes.Name).Value; + var userName = claims.FirstOrDefault(o => o.Type == validationParameters.NameClaimType).Value; using var scope = this._serviceProvider.CreateScope(); var userService = scope.ServiceProvider.GetService(); diff --git a/labs/Teacher/TeacherExt/Views/Home/Update.cshtml b/labs/Teacher/TeacherExt/Views/Home/Update.cshtml index e953dfa7..013dc81b 100644 --- a/labs/Teacher/TeacherExt/Views/Home/Update.cshtml +++ b/labs/Teacher/TeacherExt/Views/Home/Update.cshtml @@ -86,23 +86,16 @@ var checkedProp = props.FirstOrDefault(o => o.PropertyName == prop.PropertyName + "Checked"); @if (checkedProp != null) { -
- @if (!self) - { - @if (Model.CheckStatus == "待审核" && User.IsInRole("学校管理员")) - { - @Html.Editor(checkedProp.PropertyName) - } - else - { -
- @Html.Hidden(checkedProp.PropertyName) - @Html.Display(checkedProp.PropertyName, "Bool") -
- } - } + @if (!self && (Model.CheckStatus == "待审核" && User.IsInRole("学校管理员"))) + { + @Html.Editor(checkedProp.PropertyName) + } + else + { + @Html.Hidden(checkedProp.PropertyName) + @Html.Display(checkedProp.PropertyName, "Bool") -
+ } } } @@ -113,19 +106,16 @@
@Html.LabelFor(o => o.Comment, new { @class = "col-sm-2 col-form-label" })
- @if (!self) + @if (!self && isCheck) { - @if (isCheck) - { - @Html.TextAreaFor(o => o.Comment, new { @class = "form-control" }) - } - else - { -
- @Html.HiddenFor(o => o.Comment) - @Html.DisplayFor(o => o.Comment) -
- } + @Html.TextAreaFor(o => o.Comment, new { @class = "form-control" }) + } + else + { +
+ @Html.HiddenFor(o => o.Comment) + @Html.DisplayFor(o => o.Comment) +
}