From 54c9ed5420fb2166b467ffcc2e79bbb35d0d9359 Mon Sep 17 00:00:00 2001
From: edy <edy@LAPTOP-FJ5VQJ6J>
Date: Thu, 1 Jul 2021 15:01:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A1=AB=E5=86=99=E6=97=B6=E9=97=B4=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/FillinFromController.cs                | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/FillinFromController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/FillinFromController.cs
index 997612b41..d8397a484 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/FillinFromController.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/FillinFromController.cs	
@@ -120,6 +120,14 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         public ActionResult GetFormData(string keyValue)
         {
             var FillinFromData = fillinFromIBLL.GetFillinFromEntity(keyValue);
+            if (FillinFromData.FillingCycle == "2")
+            {
+                FillinFromData.FillingTime2= FillinFromData.FillingTime;
+            }
+            else
+            {
+                FillinFromData.FillingTime1= FillinFromData.FillingTime;
+            }
             var jsonData = new
             {
                 FillinFrom = FillinFromData,
@@ -185,7 +193,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             else if (entity.FillingCycle == "3")
             {
                 entity.FillingTime = entity.FillingTime1;
-            } 
+            }
             #endregion
 
             fillinFromIBLL.SaveEntity(keyValue, entity);