From 66dfa3eb4acd67cadd2a6ac11895d6f00847959c Mon Sep 17 00:00:00 2001
From: edy <edy@LAPTOP-FJ5VQJ6J>
Date: Fri, 11 Jun 2021 14:49:06 +0800
Subject: [PATCH] 1

---
 .../Areas/EducationalAdministration/Views/Dispatch/Form.js  | 2 +-
 .../EducationalAdministration/Views/Dispatch/FormView.js    | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

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 eaf0d2e56..ba0d998cb 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,7 +98,7 @@ var bootstrap = function ($, learun) {
         if (!!processId) {
             formData.FlowNo = processId;
         }
-        if (formData.WorkName == "1") {
+        if (formData.DisOffice == "1") {
             formData.WorkName = "1";
         } else {
             formData.WorkName = "2";
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 68d77535c..ab862d9d2 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,7 +99,11 @@ var bootstrap = function ($, learun) {
         if (!!processId) {
             formData.FlowNo = processId;
         }
-        formData.WorkName = 2;
+        if (formData.DisOffice == "1") {
+            formData.WorkName = "1";
+        } else {
+            formData.WorkName = "2";
+        }
         var postData = {
             strEntity: JSON.stringify(formData)
         };