0110-gaofei

This commit is contained in:
gaofei
2022-01-10 10:55:18 +08:00
parent 93996822ec
commit d02cd7ff74
9 changed files with 673 additions and 68 deletions
@@ -103,11 +103,11 @@ namespace FineUIPro.Web.HSSE.SitePerson
this.rblSex.SelectedValue = person.Sex;
}
if (!string.IsNullOrEmpty(person.UnitId))
{
{
var unit = BLL.UnitService.GetUnitByUnitId(person.UnitId);
if (unit != null)
{
this.txtUnitName.Text = unit.UnitName;
this.txtUnitName.Text = unit.UnitName;
}
}
if (!string.IsNullOrEmpty(person.WorkAreaId))
@@ -259,11 +259,11 @@ namespace FineUIPro.Web.HSSE.SitePerson
/// 初始化下拉框
/// </summary>
private void InitDropDownList()
{
{
WorkPostService.InitWorkPostDropDownList(this.drpPost, true);
PositionService.InitPositionDropDownList(this.drpPosition, true);
PostTitleService.InitPostTitleDropDownList(this.drpTitle, true);
CertificateService.InitCertificateDropDownList(this.drpCertificate, true);
PostTitleService.InitPostTitleDropDownList(this.drpTitle, true);
CertificateService.InitCertificateDropDownList(this.drpCertificate, true);
CNProfessionalService.InitCNProfessionalDownList(this.drpMainCNProfessional, true);
CNProfessionalService.InitCNProfessionalDownList(this.drpViceCNProfessional, true);
BasicDataService.InitBasicDataProjectUnitDropDownList(this.drpEduLevel, "EDU_LEVEL", true);
@@ -494,19 +494,17 @@ namespace FineUIPro.Web.HSSE.SitePerson
{
person.Birthday = Convert.ToDateTime(this.txtBirthday.Text.Trim());
}
if (string.IsNullOrEmpty(this.txtOutTime.Text.Trim()))
if (!string.IsNullOrEmpty(imgPhoto.ImageUrl) && imgPhoto.ImageUrl != "~/res/images/blank_150.png")
{
if (!string.IsNullOrEmpty(imgPhoto.ImageUrl) && imgPhoto.ImageUrl != "~/res/images/blank_150.png")
{
person.PhotoUrl = imgPhoto.ImageUrl.Replace("~/", "");
person.HeadImage = AttachFileService.SetImageToByteArray(Funs.RootPath + person.PhotoUrl);
}
else
{
person.PhotoUrl = null;
person.HeadImage = null;
}
person.PhotoUrl = imgPhoto.ImageUrl.Replace("~/", "");
person.HeadImage = AttachFileService.SetImageToByteArray(Funs.RootPath + person.PhotoUrl);
}
else
{
person.PhotoUrl = null;
person.HeadImage = null;
}
if (!string.IsNullOrEmpty(this.txtAuditorDate.Text))
{
@@ -897,7 +895,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
{
ShowNotify("输入的身份证号码有误!", MessageBoxIcon.Warning);
}
}
}
}
}
}