From 4ff1d92e96a0b4613f476837d05ac08412931bb8 Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Sat, 26 Feb 2022 17:41:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E4=B8=AA=E4=BA=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E7=A9=BA=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/StuInfoBasic/Form.cshtml               |  2 +-
 .../Views/StuInfoBasic/FormTran.cshtml           |  2 +-
 .../Views/UserCenter/Index.cshtml                | 16 ++++++++++++----
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml
index 0ae5e5575..0e8a9dd27 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml	
@@ -148,7 +148,7 @@
         <div id="IsLeft"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">是否残疾</div>
+        <div class="lr-form-item-title">是否孤儿</div>
         <div id="IsDisability"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.cshtml
index 56e8d5d39..34e367807 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.cshtml	
@@ -148,7 +148,7 @@
         <div id="IsLeft"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">是否残疾</div>
+        <div class="lr-form-item-title">是否孤儿</div>
         <div id="IsDisability"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
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 bb8a00876..a756ea398 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	
@@ -219,7 +219,11 @@
                                     },
                                     date: function (value) {
                                         var date = new Date(value);
-                                        return date.toLocaleDateString();
+                                        if (date instanceof Date && !isNaN(date.getTime())) {
+                                            return date.toLocaleDateString();
+                                        } else {
+                                            return '';
+                                        }
                                     },
                                     nationalityNo: function (value) {
                                         var result;
@@ -236,7 +240,7 @@
                                         var result;
                                         top.learun.clientdata.getAsync('dataItem', {
                                             key: value,
-                                            code: 'BCdPartyFace',
+                                            code: 'PolityStatus',
                                             callback: function (_data) {
                                                 result = _data.text;
                                             }
@@ -461,7 +465,11 @@
                                     },
                                     date: function (value) {
                                         var date = new Date(value);
-                                        return date.toLocaleDateString();
+                                        if (date instanceof Date && !isNaN(date.getTime())) {
+                                            return date.toLocaleDateString();
+                                        } else {
+                                            return '';
+                                        }
                                     },
                                     company: function (value) {
                                         var result;
@@ -491,7 +499,7 @@
                                         var result;
                                         top.learun.clientdata.getAsync('dataItem', {
                                             key: value,
-                                            code: 'BCdPartyFace',
+                                            code: 'PolityStatus',
                                             callback: function (_data) {
                                                 result = _data.text;
                                             }