From cf2710e2d4e35dd11ce1bb45c04c528654d4a4ec Mon Sep 17 00:00:00 2001
From: edy <edy@LAPTOP-FJ5VQJ6J>
Date: Fri, 11 Jun 2021 15:11:27 +0800
Subject: [PATCH] 1

---
 .../Controllers/DispatchController.cs                     | 8 ++++++++
 .../EducationalAdministration/Views/Dispatch/Form.js      | 5 -----
 .../EducationalAdministration/Views/Dispatch/FormView.js  | 5 -----
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/DispatchController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/DispatchController.cs
index 66cccfdcd..7fbe8369e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/DispatchController.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/DispatchController.cs	
@@ -149,6 +149,14 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         {
             DispatchEntity entity = strEntity.ToObject<DispatchEntity>();
             entity.FlowNo = "0";
+            if (entity.DisOffice == "1")
+            {
+                entity.WorkName = "1";
+            }
+            else
+            {
+                entity.WorkName = "2";
+            }
             dispatchIBLL.SaveEntity(keyValue, entity);
 
             if (string.IsNullOrEmpty(keyValue))
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Form.js
index ba0d998cb..c3970e9aa 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Form.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Form.js	
@@ -98,11 +98,6 @@ var bootstrap = function ($, learun) {
         if (!!processId) {
             formData.FlowNo = processId;
         }
-        if (formData.DisOffice == "1") {
-            formData.WorkName = "1";
-        } else {
-            formData.WorkName = "2";
-        }
         var postData = {
             strEntity: JSON.stringify(formData)
         };
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/FormView.js
index ab862d9d2..028a6db32 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/FormView.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/FormView.js	
@@ -99,11 +99,6 @@ var bootstrap = function ($, learun) {
         if (!!processId) {
             formData.FlowNo = processId;
         }
-        if (formData.DisOffice == "1") {
-            formData.WorkName = "1";
-        } else {
-            formData.WorkName = "2";
-        }
         var postData = {
             strEntity: JSON.stringify(formData)
         };