From f3a8ec7d88a01476921f627d2c5c05cbac46dbd6 Mon Sep 17 00:00:00 2001 From: liangkun Date: Fri, 10 Mar 2023 15:17:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=99=E5=B8=88=E4=B8=AA=E4=BA=BA=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=9F=A5=E7=9C=8B=E6=94=BF=E6=B2=BB=E9=9D=A2=E8=B2=8C?= =?UTF-8?q?=E4=B8=8E=E4=BF=AE=E6=94=B9=E7=9B=B8=E5=8C=B9=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/EmpInfoController.cs | 10 +++------- .../Views/UserCenter/Index.cshtml | 8 +++----- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/EmpInfoController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/EmpInfoController.cs index 682f081cd..fb16ddb26 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/EmpInfoController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/EmpInfoController.cs @@ -133,14 +133,10 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers // empInfo.NationalityNo = nationality.Rows[0][1].ToString(); //} //政治面貌 - empInfo.PartyFaceNo = dataItemIBLL.GetDetailList("BCdPartyFace").FirstOrDefault(x => x.F_ItemValue == empInfo.PartyFaceNo)?.F_ItemName; - + empInfo.PartyFaceNo = dataItemIBLL.GetDetailList("PolityStatus").FirstOrDefault(x => x.F_ItemValue == empInfo.PartyFaceNo)?.F_ItemName; + //最高学历 - var highestRecord = dataSourceIBLL.GetDataTable("BCdCultureDegree", "t.CultureDegreeNo='" + empInfo.HighestRecord + "'"); - if (highestRecord != null && highestRecord.Rows.Count > 0) - { - empInfo.HighestRecord = highestRecord.Rows[0][1].ToString(); - } + empInfo.HighestRecord = dataItemIBLL.GetDetailList("RecordInSchool").FirstOrDefault(x => x.F_ItemValue == empInfo.HighestRecord)?.F_ItemName; //头像 empInfo.Photo = annexesFileIBLL.GetEntityByFolderId(empInfo.Photo)?.F_FilePath; if (!string.IsNullOrEmpty(empInfo.Photo)) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml index 45dd0cf8b..53df327db 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml @@ -493,13 +493,11 @@ }, nationalityNo: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - sync: true, - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + top.learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - result = _data['nationality']; + result = _data.text; } }); return result;