Former-commit-id: 1b0cce83171f3db20aafce59cba7501a0077adcf
Former-commit-id: 40b20511cd00e29e25cb676eced9532efa30e433
1.0
wanggang 5 years ago
parent d63fc9b201
commit a09ca18a8f

@ -29,7 +29,7 @@ namespace Infrastructure.Web
{ {
validatedToken = new JwtSecurityTokenHandler().ReadJwtToken(securityToken); validatedToken = new JwtSecurityTokenHandler().ReadJwtToken(securityToken);
var claims = (validatedToken as JwtSecurityToken).Claims.ToList(); 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(); using var scope = this._serviceProvider.CreateScope();
var userService = scope.ServiceProvider.GetService<IUserService>(); var userService = scope.ServiceProvider.GetService<IUserService>();

@ -86,23 +86,16 @@
var checkedProp = props.FirstOrDefault(o => o.PropertyName == prop.PropertyName + "Checked"); var checkedProp = props.FirstOrDefault(o => o.PropertyName == prop.PropertyName + "Checked");
@if (checkedProp != null) @if (checkedProp != null)
{ {
<div class="form-control" style="border-color:transparent;padding-left:0;"> @if (!self && (Model.CheckStatus == "待审核" && User.IsInRole("学校管理员")))
@if (!self) {
{ @Html.Editor(checkedProp.PropertyName)
@if (Model.CheckStatus == "待审核" && User.IsInRole("学校管理员")) }
{ else
@Html.Editor(checkedProp.PropertyName) {
} @Html.Hidden(checkedProp.PropertyName)
else @Html.Display(checkedProp.PropertyName, "Bool")
{
<div class="form-control" style="border-color:transparent;padding-left:0;">
@Html.Hidden(checkedProp.PropertyName)
@Html.Display(checkedProp.PropertyName, "Bool")
</div>
}
}
</div> }
} }
} }
</div> </div>
@ -113,19 +106,16 @@
<div class="form-group row"> <div class="form-group row">
@Html.LabelFor(o => o.Comment, new { @class = "col-sm-2 col-form-label" }) @Html.LabelFor(o => o.Comment, new { @class = "col-sm-2 col-form-label" })
<div class="col-sm-8"> <div class="col-sm-8">
@if (!self) @if (!self && isCheck)
{ {
@if (isCheck) @Html.TextAreaFor(o => o.Comment, new { @class = "form-control" })
{ }
@Html.TextAreaFor(o => o.Comment, new { @class = "form-control" }) else
} {
else <div class="form-control" style="border-color:transparent;height:auto;padding-left:0;color:red;">
{ @Html.HiddenFor(o => o.Comment)
<div class="form-control" style="border-color:transparent;height:auto;padding-left:0;"> @Html.DisplayFor(o => o.Comment)
@Html.HiddenFor(o => o.Comment) </div>
@Html.DisplayFor(o => o.Comment)
</div>
}
} }
</div> </div>
<div class="col-sm-2"></div> <div class="col-sm-2"></div>

Loading…
Cancel
Save