From 0f080fa052365086a1423323006e8b8fd38f5117 Mon Sep 17 00:00:00 2001
From: liangkun <liangkun7173@hotmail.com>
Date: Tue, 20 Oct 2020 11:08:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=82=AC=E5=8A=9E=E5=AE=A1=E6=A0=B8=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../XmlConfig/database.config                    |  8 ++++----
 .../Process/NWFProcessBLL.cs                     | 16 ++++++++++------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config
index 5d293d24b..489b3b61f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config	
@@ -16,17 +16,17 @@
   <!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />-->
-  <!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+  <add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
-  <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />-->
+  <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
 
   <!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_20200403test;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_20200403test;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />-->
   <!--金隅-->
-  <add name="BaseDb" connectionString="Server=192.168.100.225;Initial Catalog=adms7ultimate2;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
+  <!--<add name="BaseDb" connectionString="Server=192.168.100.225;Initial Catalog=adms7ultimate2;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=192.168.100.225;Initial Catalog=CollegeMIS;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
-  <add name="hangfireString" connectionString="Server=192.168.100.225;Initial Catalog=Hangfire;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
+  <add name="hangfireString" connectionString="Server=192.168.100.225;Initial Catalog=Hangfire;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />-->
   <!--126西昌测试-->
   <!--<add name="BaseDb" connectionString="Server=192.168.2.126;Initial Catalog=adms7ultimate2_西昌;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=192.168.2.126;Initial Catalog=CollegeMIS_西昌;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessBLL.cs
index 130cb7ab3..503b5dd51 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessBLL.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessBLL.cs	
@@ -2815,11 +2815,13 @@ namespace Learun.Application.WorkFlow
                             };
                             nWFTaskMsgEntity.Create();
                             taskMsgList.Add(nWFTaskMsgEntity);
-
-                            // 触发消息
-                            _SendMsg(taskMsgList, nWFIEngine);
                         }
                     }
+                    if (taskMsgList.Count > 0)
+                    {
+                        // 触发消息
+                        _SendMsg(taskMsgList, nWFIEngine);
+                    }
                 }
             }
 
@@ -2882,12 +2884,14 @@ namespace Learun.Application.WorkFlow
                                 };
                                 nWFTaskMsgEntity.Create();
                                 pTaskMsgList.Add(nWFTaskMsgEntity);
-
-                                // 触发消息
-                                _SendMsg(pTaskMsgList, pNWFIEngine);
                                 taskMsgList.AddRange(pTaskMsgList);
                             }
                         }
+                        if (pTaskMsgList.Count > 0)
+                        {
+                            // 触发消息
+                            _SendMsg(pTaskMsgList, pNWFIEngine);
+                        }
                     }
                 }
             }