diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/my/userInfo/userInfo.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/my/userInfo/userInfo.js index f7fdb6c47..99c1ca912 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/my/userInfo/userInfo.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/my/userInfo/userInfo.js @@ -1,4 +1,4 @@ -(function () { +(function () { var page = { isScroll: true, init: function ($page) { @@ -9,7 +9,7 @@ $page.find('img').attr('src', config.webapi + 'learun/adms/user/img?data=' + baseinfo.userId); - $page.find('.account').text(baseinfo.account); + $page.find('.account').text(baseinfo.IdentityCardNo); $page.find('.enCode').text(baseinfo.enCode); $page.find('.realName').text(baseinfo.realName); $page.find('.gender').text(baseinfo.gender == 1 ? '男' : '女'); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util.Operat/OperatorHelper.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util.Operat/OperatorHelper.cs index f2fdaa45a..76bad842d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util.Operat/OperatorHelper.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util.Operat/OperatorHelper.cs @@ -323,13 +323,16 @@ namespace Learun.Util.Operat userInfo.isSystem = userEntity.F_SecurityLevel == 1 ? true : false; userInfo.Description = userEntity.F_Description; + userInfo.IdentityCardNo = + userEntity.F_IdentityCardNo.IsEmpty().ToString() == "True" ? "" : ""; + userInfo.roleIds = userRelationIBLL.GetObjectIds(userEntity.F_UserId, 1); if (!string.IsNullOrEmpty(userInfo.roleIds)) { var rolelist = userRelationIBLL.GetRoleListByUserId(userEntity.F_UserId); foreach (var roleEntity in rolelist) { - userInfo.roleName += roleEntity.F_FullName+ ","; + userInfo.roleName += roleEntity.F_FullName + ","; } } userInfo.postIds = userRelationIBLL.GetObjectIds(userEntity.F_UserId, 2); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util/Web/UserInfo.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util/Web/UserInfo.cs index 68fea6dd0..cf5e0bcd3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util/Web/UserInfo.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util/Web/UserInfo.cs @@ -19,6 +19,10 @@ namespace Learun.Util /// public string userId { get; set; } /// + /// 身份号 + /// + public string IdentityCardNo { get; set; } + /// /// 工号 /// public string enCode { get; set; } @@ -153,7 +157,7 @@ namespace Learun.Util /// 学生专业 /// - public string majorno { get; set; } + public string majorno { get; set; } /// /// 学生年级 ///