From 7270880fdeabd905a9374479d0ac2c87d40401c7 Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Thu, 12 May 2022 17:40:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=9F=A5=E7=9C=8B=E4=B8=AA=E4=BA=BA=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../www/pages/my/userInfo/userInfo.js                       | 4 ++--
 .../Learun.Util/Learun.Util.Operat/OperatorHelper.cs        | 5 ++++-
 .../Learun.Util/Learun.Util/Web/UserInfo.cs                 | 6 +++++-
 3 files changed, 11 insertions(+), 4 deletions(-)

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
         /// </summary>		
         public string userId { get; set; }
         /// <summary>
+        /// 身份号
+        /// </summary>
+        public string IdentityCardNo { get; set; }
+        /// <summary>
         /// 工号
         /// </summary>	
         public string enCode { get; set; }
@@ -153,7 +157,7 @@ namespace Learun.Util
         /// 学生专业
         /// </summary>
 
-        public string majorno { get; set; } 
+        public string majorno { get; set; }
         /// <summary>
         /// 学生年级
         /// </summary>