From 96474556dc999c22a2a3d8dfdd33b4194284b315 Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Thu, 21 Jul 2022 11:03:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=A1=E5=8C=BA=E7=AE=80=E5=8E=86=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LR_OrganizationModule/Controllers/CompanyController.cs  | 6 ++++--
 .../Areas/LR_OrganizationModule/Views/Company/Form.cshtml   | 6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/CompanyController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/CompanyController.cs
index d86b5e4b1..e7baf2ceb 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/CompanyController.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/CompanyController.cs	
@@ -106,12 +106,14 @@ namespace Learun.Application.Web.Areas.LR_OrganizationModule.Controllers
         [HttpPost]
         [ValidateAntiForgeryToken]
         [AjaxOnly]
-        public ActionResult SaveForm(string keyValue, CompanyEntity entity)
+        [ValidateInput(false)]
+        public ActionResult SaveForm(string keyValue, string strEntity)
         {
+            CompanyEntity entity = strEntity.ToObject<CompanyEntity>();
             entity.SyncFlag = false;
-            var list = companyIBLL.GetList();
             entity.F_BriefIntroduction = WebHelper.HtmlEncode(entity.F_BriefIntroduction);
             entity.F_EnrollmentInformation = WebHelper.HtmlEncode(entity.F_EnrollmentInformation);
+            var list = companyIBLL.GetList();
             if (!string.IsNullOrEmpty(keyValue))
             {
                 entity.SyncFlag = true;
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Company/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Company/Form.cshtml
index c9715b76f..80801f5ea 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Company/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Company/Form.cshtml	
@@ -20,8 +20,8 @@
         <div id="F_ParentId"></div>
     </div>
     <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">成立时间</div>
-        <input id="F_FoundedTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker()" />
+        <div class="lr-form-item-title">成立时间<font face="宋体">*</font></div>
+        <input id="F_FoundedTime" type="text" isvalid="yes" checkexpession="NotNull" class="form-control lr-input-wdatepicker" onfocus="WdatePicker()" />
     </div>
     <div class="col-xs-6 lr-form-item">
         <div class="lr-form-item-title">负责人</div>
@@ -34,7 +34,7 @@
 
     <div class="col-xs-6 lr-form-item">
         <div class="lr-form-item-title">电子邮箱</div>
-        <input id="F_Email" type="text" class="form-control" />
+        <input id="F_Email" type="text" class="form-control" isvalid="yes" checkexpession="EmailOrNull" />
     </div>
     <div class="col-xs-6 lr-form-item">
         <div class="lr-form-item-title">照片</div>