From 5245f0fb25d49f9c6cffbc704a27fd64df87c56a Mon Sep 17 00:00:00 2001
From: zhichao lei <442149704@qq.com>
Date: Mon, 28 Sep 2020 09:07:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E6=96=87=E6=8E=A5=E6=94=B6=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/Sys_ReceiveFile/Form.cshtml         |   6 +-
 .../Views/Sys_ReceiveFile/Form.js             |   6 +
 ...e.config.49266.17.2020-01-06.17-54-33.6315 |  28 ----
 ...e.config.50042.25.2020-01-17.15-24-12.7808 |  28 ----
 ...e.config.70131.30.2020-04-17.13-34-11.6306 |  34 -----
 ...e.config.73081.31.2020-05-25.09-50-16.1906 |  34 -----
 ...e.config.73164.32.2020-07-30.11-01-55.8521 |  34 -----
 ....config.107241.23.2020-08-14.16-11-33.0902 | 135 ------------------
 ...m.config.49102.11.2020-01-06.17-54-33.6375 | 124 ----------------
 .../XmlConfig/database.config                 |   8 +-
 .../Sys_ReceiveDocumentEntity.cs              |   1 -
 .../Learun.Workflow.Engine/NWFEngine.cs       |  11 +-
 12 files changed, 21 insertions(+), 428 deletions(-)
 delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/database.config.49266.17.2020-01-06.17-54-33.6315
 delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/database.config.50042.25.2020-01-17.15-24-12.7808
 delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/database.config.70131.30.2020-04-17.13-34-11.6306
 delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/database.config.73081.31.2020-05-25.09-50-16.1906
 delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/database.config.73164.32.2020-07-30.11-01-55.8521
 delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/system.config.107241.23.2020-08-14.16-11-33.0902
 delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/system.config.49102.11.2020-01-06.17-54-33.6375

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.cshtml
index 79f2cb5e8..3fe7da42e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.cshtml	
@@ -5,16 +5,12 @@
 <div class="lr-form-wrap">
     <div class="col-xs-12 lr-form-item" data-table="Sys_ReceiveFile">
         <div class="lr-form-item-title">发送人</div>
-        <input id="Sender" type="text" class="form-control" readonly="readonly" />
+        <div id="SenderId"></div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Sys_ReceiveFile">
         <div class="lr-form-item-title">主题</div>
         <input id="Title" type="text" class="form-control" readonly="readonly" />
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="Sys_ReceiveFile">
-        <div class="lr-form-item-title">接收对象</div>
-        <div id="SendType" readonly="readonly"></div>
-    </div>
     <div class="col-xs-12 lr-form-item" data-table="Sys_ReceiveFile">
         <div class="lr-form-item-title">发送时间</div>
         <input id="SendTime" type="text" class="form-control" readonly="readonly" />
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.js
index 22b6ce1ae..fbadefa2a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.js	
@@ -16,6 +16,12 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
+            $('#SenderId').lrformselect({
+                layerUrl: top.$.rootUrl + '/LR_OrganizationModule/User/SelectOnlyForm',
+                layerUrlW: 400,
+                layerUrlH: 300,
+                dataUrl: top.$.rootUrl + '/LR_OrganizationModule/User/GetListByUserIds'
+            }); 
             $('#SendType').lrDataItemSelect({ code: 'FileSendType' });
             if (selectedRow.ReadFlag == true) {//已读
                 $('#Url').lrUploader();
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/database.config.49266.17.2020-01-06.17-54-33.6315 b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/database.config.49266.17.2020-01-06.17-54-33.6315
deleted file mode 100644
index f979c8be4..000000000
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/database.config.49266.17.2020-01-06.17-54-33.6315	
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<connectionStrings>
-  <!--本机-->
-  <!--<add name="BaseDb" connectionString="Server=.;Initial Catalog=adms7ultimate2;User ID=sa;Password=1" providerName="System.Data.SqlClient" />
-  <add name="CollegeMIS" connectionString="Server=.;Initial Catalog=CollegeMIS;User ID=sa;Password=1" 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" />-->
-  <!--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" />
-  <add name="hangfireString" connectionString="Server=192.168.2.126;Initial Catalog=Hangfire;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />
-  <!--西昌-->
-  <!--<add name="BaseDb" connectionString="Server=112.45.152.8;Initial Catalog=adms7ultimate2;User ID=sa;Password=qj@2018" providerName="System.Data.SqlClient" />
-  <add name="CollegeMIS" connectionString="Server=112.45.152.8;Initial Catalog=NewCollegeMIS;User ID=sa;Password=qj@2018" providerName="System.Data.SqlClient" />
-  <add name="hangfireString" connectionString="Server=112.45.152.8;Initial Catalog=Hangfire;User ID=sa;Password=qj@2018" providerName="System.Data.SqlClient" />-->
-  <!--demo.quanjiang.com-->
-  <!--<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=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" />-->
-  <!--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" />
-  <add name="hangfireString" connectionString="Server=192.168.2.126;Initial Catalog=Hangfire;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />-->
-
-</connectionStrings>
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/database.config.50042.25.2020-01-17.15-24-12.7808 b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/database.config.50042.25.2020-01-17.15-24-12.7808
deleted file mode 100644
index 07106d733..000000000
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/database.config.50042.25.2020-01-17.15-24-12.7808	
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<connectionStrings>
-  <!--本机-->
-  <!--<add name="BaseDb" connectionString="Server=.;Initial Catalog=adms7ultimate2;User ID=sa;Password=1" providerName="System.Data.SqlClient" />
-  <add name="CollegeMIS" connectionString="Server=.;Initial Catalog=CollegeMIS;User ID=sa;Password=1" 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" />-->
-  <!--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" />
-  <add name="hangfireString" connectionString="Server=192.168.2.126;Initial Catalog=Hangfire;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />-->
-  <!--西昌-->
-  <!--<add name="BaseDb" connectionString="Server=112.45.152.8;Initial Catalog=adms7ultimate2;User ID=sa;Password=qj@2018" providerName="System.Data.SqlClient" />
-  <add name="CollegeMIS" connectionString="Server=112.45.152.8;Initial Catalog=NewCollegeMIS;User ID=sa;Password=qj@2018" providerName="System.Data.SqlClient" />
-  <add name="hangfireString" connectionString="Server=112.45.152.8;Initial Catalog=HangFire;User ID=sa;Password=qj@2018" providerName="System.Data.SqlClient" />-->
-  <!--demo.quanjiang.com-->
-  <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=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" />-->
-  <!--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" />
-  <add name="hangfireString" connectionString="Server=192.168.2.126;Initial Catalog=Hangfire;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />-->
-
-</connectionStrings>
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/database.config.70131.30.2020-04-17.13-34-11.6306 b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/database.config.70131.30.2020-04-17.13-34-11.6306
deleted file mode 100644
index 02b271a32..000000000
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/database.config.70131.30.2020-04-17.13-34-11.6306	
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<connectionStrings>
-  <!--本机-->
-  <!--<add name="BaseDb" connectionString="Server=.;Initial Catalog=adms7ultimate2;User ID=sa;Password=1" providerName="System.Data.SqlClient" />
-  <add name="CollegeMIS" connectionString="Server=.;Initial Catalog=CollegeMIS;User ID=sa;Password=1" 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" />-->
-  <!--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" />
-  <add name="hangfireString" connectionString="Server=192.168.2.126;Initial Catalog=Hangfire;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />-->
-  <!--西昌-->
-  <!--<add name="BaseDb" connectionString="Server=112.45.152.8;Initial Catalog=adms7ultimate2;User ID=sa;Password=qj@2018" providerName="System.Data.SqlClient" />
-  <add name="CollegeMIS" connectionString="Server=112.45.152.8;Initial Catalog=NewCollegeMIS;User ID=sa;Password=qj@2018" providerName="System.Data.SqlClient" />
-  <add name="hangfireString" connectionString="Server=112.45.152.8;Initial Catalog=HangFire;User ID=sa;Password=qj@2018" providerName="System.Data.SqlClient" />-->
-  <!--demo.quanjiang.com-->
-  <!--<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="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_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="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" />-->
-  <!--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" />
-  <add name="hangfireString" connectionString="Server=192.168.2.126;Initial Catalog=Hangfire;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />-->
-
-</connectionStrings>
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/database.config.73081.31.2020-05-25.09-50-16.1906 b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/database.config.73081.31.2020-05-25.09-50-16.1906
deleted file mode 100644
index b28aeca65..000000000
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/database.config.73081.31.2020-05-25.09-50-16.1906	
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<connectionStrings>
-  <!--本机-->
-  <!--<add name="BaseDb" connectionString="Server=.;Initial Catalog=adms7ultimate2;User ID=sa;Password=1" providerName="System.Data.SqlClient" />
-  <add name="CollegeMIS" connectionString="Server=.;Initial Catalog=CollegeMIS;User ID=sa;Password=1" 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" />-->
-  <!--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" />
-  <add name="hangfireString" connectionString="Server=192.168.2.126;Initial Catalog=Hangfire;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />-->
-  <!--西昌-->
-  <add name="BaseDb" connectionString="Server=112.45.152.8;Initial Catalog=adms7ultimate2;User ID=sa;Password=qj@2018" providerName="System.Data.SqlClient" />
-  <add name="CollegeMIS" connectionString="Server=112.45.152.8;Initial Catalog=NewCollegeMIS;User ID=sa;Password=qj@2018" providerName="System.Data.SqlClient" />
-  <add name="hangfireString" connectionString="Server=112.45.152.8;Initial Catalog=HangFire;User ID=sa;Password=qj@2018" providerName="System.Data.SqlClient" />
-  <!--demo.quanjiang.com-->
-  <!--<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="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_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="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" />-->
-  <!--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" />
-  <add name="hangfireString" connectionString="Server=192.168.2.126;Initial Catalog=Hangfire;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />-->
-
-</connectionStrings>
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/database.config.73164.32.2020-07-30.11-01-55.8521 b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/database.config.73164.32.2020-07-30.11-01-55.8521
deleted file mode 100644
index b28aeca65..000000000
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/database.config.73164.32.2020-07-30.11-01-55.8521	
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<connectionStrings>
-  <!--本机-->
-  <!--<add name="BaseDb" connectionString="Server=.;Initial Catalog=adms7ultimate2;User ID=sa;Password=1" providerName="System.Data.SqlClient" />
-  <add name="CollegeMIS" connectionString="Server=.;Initial Catalog=CollegeMIS;User ID=sa;Password=1" 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" />-->
-  <!--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" />
-  <add name="hangfireString" connectionString="Server=192.168.2.126;Initial Catalog=Hangfire;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />-->
-  <!--西昌-->
-  <add name="BaseDb" connectionString="Server=112.45.152.8;Initial Catalog=adms7ultimate2;User ID=sa;Password=qj@2018" providerName="System.Data.SqlClient" />
-  <add name="CollegeMIS" connectionString="Server=112.45.152.8;Initial Catalog=NewCollegeMIS;User ID=sa;Password=qj@2018" providerName="System.Data.SqlClient" />
-  <add name="hangfireString" connectionString="Server=112.45.152.8;Initial Catalog=HangFire;User ID=sa;Password=qj@2018" providerName="System.Data.SqlClient" />
-  <!--demo.quanjiang.com-->
-  <!--<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="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_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="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" />-->
-  <!--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" />
-  <add name="hangfireString" connectionString="Server=192.168.2.126;Initial Catalog=Hangfire;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />-->
-
-</connectionStrings>
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/system.config.107241.23.2020-08-14.16-11-33.0902 b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/system.config.107241.23.2020-08-14.16-11-33.0902
deleted file mode 100644
index 6f165e9d7..000000000
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/system.config.107241.23.2020-08-14.16-11-33.0902	
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<appSettings>
-  <!-- ================== 1：开发系统相关配置 ================== -->
-  <!-- 启用系统日志-->
-  <add key="IsLog" value="true" />
-  <!-- 是否启用js、css压缩-->
-  <add key="JsCompressor" value="false" />
-  <!-- 是否启用js、css缓存-->
-  <add key="JsCompressorCache" value="false" />
-  <!-- 代码生成器路径-->
-  <add key="BackProject" value="Learun.Application.TwoDevelopment" />
-  <add key="MappingDirectory" value="\Learun.Framework.Module\Learun.Application.Module\Learun.Application.Mapping" />
-  <add key="ServiceDirectory" value="\Learun.Framework.Module\Learun.Application.Module\Learun.Application.TwoDevelopment" />
-  <add key="WebDirectory" value="\Learun.Application.Web" />
-  <add key="ApiDirectory" value="\Learun.Application.WebApi" />
-  <add key="AppDirectory" value="\Learun.Application.Mobile" />
-  <!-- ================== 2：这里主要是微信配置项内容部分 ================== -->
-  <!--企业号CorpId -->
-  <add key="CorpId" value="" />
-  <!--企业号凭证密钥 -->
-  <add key="CorpSecret" value="" />
-  <!--开放平台AppId -->
-  <add key="AppId" value="" />
-  <!--开放平台凭证密钥 -->
-  <add key="AppSecret" value="" />
-  <!-- ================== 3：访问过滤配置 ================== -->
-  <!--设置IP过滤 -->
-  <add key="FilterIP" value="false" />
-  <!--设置时段过滤 -->
-  <add key="FilterTime" value="false" />
-  <!-- ================== 4：系统软件参数配置 ================== -->
-  <!-- 联系我们 -->
-  <add key="Contact" value="www.xx.cn" />
-  <!-- 公司名称 -->
-  <add key="CustomerCompanyName" value="数字化智慧校园" />
-  <!-- 系统名称 -->
-  <add key="SystemName" value="数字化智慧校园" />
-  <!-- 软件名称 -->
-  <add key="SoftName" value="数字化智慧校园" />
-  <!-- 软件版本 -->
-  <add key="Version" value="3.0.1" />
-  <!-- 软件注册码，备用 -->
-  <add key="RegisterKey" value="NO:LR20180307002" />
-  <!-- ================== 5：外部邮件参数 ================== -->
-  <!-- 系统错误自动发送邮件 -->
-  <add key="ErrorToMail" value="false" />
-  <!-- 接收错误信息的邮箱 -->
-  <add key="RereceiveErrorMail" value="" />
-  <!-- 发出邮箱的名称 -->
-  <add key="MailName" value="" />
-  <!-- 发出邮箱的地址 -->
-  <add key="MailUserName" value="" />
-  <!-- 发出邮箱的密码 -->
-  <add key="MailPassword" value="" />
-  <!-- 发出邮箱设置邮箱主机 -->
-  <add key="MailHost" value="" />
-  <!--内控材料上传角色名-->
-  <add key="MPRoleName" value="内控材料上传员" />
-  <!-- ================== 6：即时通信参数 ================== -->
-  <!-- SignalR服务接口-->
-  <add key="IMUrl" value="http://192.168.2.126:8012/signalr" />
-  <add key="userKey" value="14B417B0-463D-4F2B-8075-0A20EEDB773A" />
-  <!-- ==================注意附件上传地址  修改到部署目录下的Resource要不然飞星会报错================== -->
-  <add key="AnnexesFile" value="D:\Project\数字化校园\Learun.Framework.Ultimate V7\Learun.Application.Web\Resource" />
-  <!-- ================== 8：流程服务地址 ================== -->
-  <add key="workflowapi" value="http://localhost:8013" />
-  <!--Redis 缓存前缀 -->
-  <add key="RedisPrev" value="LRADMS" />
-  <!--head 头像存储地址 -->
-  <add key="fileHeadImg" value="E:\西昌程序单校区版2019_09_16\Learun.Framework.Ultimate V7\Learun.Application.Web\bin\Release\Publish\Content\images\head" />
-  <add key="fileAppDTImg" value="C:/fileAppDTImg" />
-  <add key="fileLogoImg" value="C:/fileLogoImg" />
-  <!-- ================== 9：禁用BrowserLink，解决进度条卡在99%问题 ================== -->
-  <add key="vs:EnableBrowserLink" value="false"/>
-  <!--获取高职版跳转地址url -->
-  <!--<add key="DigitalschoolMisLoginurl" value="http://192.168.2.126:9000/LoginHandler.ashx"/>-->
-  <!--<add key="DigitalschoolMisLoginurl" value="http://192.168.100.225:9000/LoginHandler.ashx"/>-->
-  <add key="DigitalschoolMisLoginurl" value="http://123.57.209.16:9000/LoginHandler.ashx"/>
-  <!--<add key="DigitalschoolMisLoginurl" value="http://112.45.152.8:8082/LoginHandler.ashx"/>-->
-  <!-- ================== 默认密码 ================== -->
-  <add key="defaultpwd" value="123456" />
-  <add key="defaultpwdeight" value="abc123**" />
-  <!-- ================== 统一身份认证公钥密钥 ================== -->
-  <add key="SSOPublicSecret" value="bjquanjiang" />
-  <add key="SSOUserSecret" value="123456789" />
-  <!-- ================== 飞星通讯地址 下发新闻用 ================== -->
-  <!--<add key="CommunicationServeraddress" value="http://127.0.0.1:8866/ChatConnection" />-->
-  <add key="CommunicationServeraddress" value="http://123.57.209.16:8866/ChatConnection" />
-  <!-- ================== 默认头像 ================== -->
-  <add key="defaultheadimg" value="/Content/images/head/on-boy.jpg" />
-  <!--排课接口-->
-  <add key="ArrangeLessonAPI" value="http://112.45.152.8:9002/interface/paike/paike" />
-  <!--初始化排课接口-->
-  <add key="ModifyArrangeLessonAPI" value="http://112.45.152.8:9002/interface/paike/updatePaike" />
-  <!--开课计划接口-->
-  <add key="OpenLessonPlanAPI" value="http://112.45.152.8:9002/interface/paike/majorInterface" />
-
-  <!--选修排课接口-->
-  <add key="ArrangeLessonOfElectiveAPI" value="http://112.45.152.8:9002/interface/paike/xuanxiupaike" />
-  <!--初始化选修排课接口-->
-  <add key="ModifyArrangeLessonOfElectiveAPI" value="http://112.45.152.8:9002/interface/paike/updateXuanXiuPaike" />
-
-  <!--排考接口-->
-  <add key="ArrangeExamAPI" value="http://112.45.152.8:9002/interface/paikao/paikao" />
-  <!--选修排考接口-->
-  <add key="ArrangeExamOfElectiveAPI" value="http://112.45.152.8:9002/interface/paikao/xuanxiupaikao" />
-  <!--排考结构接口-->
-  <add key="ArrangeExamStructureAPI" value="http://112.45.152.8:9002/interface/paikao/geitime" />
-  <!--考试成绩接口-->
-  <add key="ExamScoreAPI" value="http://123.57.209.16:12203/jeeplus/app/stuScore" />
-
-  <!--考试系统学生端-->
-  <add key="kaoshisystemurl" value="http://ks.bjquanjiang.com/RereClientConnector" />
-  <!--批量生成学生帐号时默认的角色Id-->
-  <add key="GenerateStudentsRoleId" value="0cfc388c-80e6-4cf0-b53b-02201827490a" />
-  <!--批量生成教师帐号时默认的角色Id-->
-  <add key="GenerateTeachersRoleId" value="e1702746-185a-4480-8f19-3892066555cf" />
-  <add key="QingJuurl" value="http://xy.bjquanjiang.com/Student/LoginForSSOHandler.ashx" />
-  <add key="QingJuRegisterurl" value="http://xy.bjquanjiang.com/Service/ServiceStudent.ashx" />
-  <add key="dbbackuppath" value="D:\数字化校园\lr7test\Publish\Resource\DataBaseBackup"/>
-
-  <!-- 报名选修课排队需要调用的WebApi -->
-  <add key="WebApi" value="http://localhost:8081/" />
-  <!-- 河南对接登录 -->
-  <add key="appid" value="TZ6RW1DUNIN6C5M88I" />
-  <add key="secret" value="55848ef07e0f4e0c991bc8b4426100b2" />
-  <add key="redirecturl" value="http://123.6.9.199:6060/Login/SSOLogin" />
-  <!-- 深信服ACIp -->
-  <add key="ACIp" value="192.168.90.2"/>
-  <add key="ACIp2" value="192.168.200.252"/>
-   <!-- 是否强制验证强密码 -->
-  <add key="verifypwd" value="false"/>
-  <!--疫情防控组角色Id-->
-  <add key="EpidemicControlTeamRoleId" value="87f38e4e-b0a6-472c-b01a-2620b8f1ec46" />
-</appSettings>
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/system.config.49102.11.2020-01-06.17-54-33.6375 b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/system.config.49102.11.2020-01-06.17-54-33.6375
deleted file mode 100644
index e2a16adbb..000000000
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/system.config.49102.11.2020-01-06.17-54-33.6375	
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<appSettings>
-  <!-- ================== 1：开发系统相关配置 ================== -->
-  <!-- 启用系统日志-->
-  <add key="IsLog" value="true" />
-  <!-- 是否启用js、css压缩-->
-  <add key="JsCompressor" value="false" />
-  <!-- 是否启用js、css缓存-->
-  <add key="JsCompressorCache" value="false" />
-  <!-- 代码生成器路径-->
-  <add key="BackProject" value="Learun.Application.TwoDevelopment" />
-  <add key="MappingDirectory" value="\Learun.Framework.Module\Learun.Application.Module\Learun.Application.Mapping" />
-  <add key="ServiceDirectory" value="\Learun.Framework.Module\Learun.Application.Module\Learun.Application.TwoDevelopment" />
-  <add key="WebDirectory" value="\Learun.Application.Web" />
-  <add key="ApiDirectory" value="\Learun.Application.WebApi" />
-  <add key="AppDirectory" value="\Learun.Application.Mobile" />
-  <!-- ================== 2：这里主要是微信配置项内容部分 ================== -->
-  <!--企业号CorpId -->
-  <add key="CorpId" value="" />
-  <!--企业号凭证密钥 -->
-  <add key="CorpSecret" value="" />
-  <!--开放平台AppId -->
-  <add key="AppId" value="" />
-  <!--开放平台凭证密钥 -->
-  <add key="AppSecret" value="" />
-  <!-- ================== 3：访问过滤配置 ================== -->
-  <!--设置IP过滤 -->
-  <add key="FilterIP" value="false" />
-  <!--设置时段过滤 -->
-  <add key="FilterTime" value="false" />
-  <!-- ================== 4：系统软件参数配置 ================== -->
-  <!-- 联系我们 -->
-  <add key="Contact" value="www.xx.cn" />
-  <!-- 公司名称 -->
-  <add key="CustomerCompanyName" value="数字化智慧校园" />
-  <!-- 系统名称 -->
-  <add key="SystemName" value="数字化智慧校园" />
-  <!-- 软件名称 -->
-  <add key="SoftName" value="数字化智慧校园" />
-  <!-- 软件版本 -->
-  <add key="Version" value="3.0.1" />
-  <!-- 软件注册码，备用 -->
-  <add key="RegisterKey" value="NO:LR20180307002" />
-  <!-- ================== 5：外部邮件参数 ================== -->
-  <!-- 系统错误自动发送邮件 -->
-  <add key="ErrorToMail" value="false" />
-  <!-- 接收错误信息的邮箱 -->
-  <add key="RereceiveErrorMail" value="" />
-  <!-- 发出邮箱的名称 -->
-  <add key="MailName" value="" />
-  <!-- 发出邮箱的地址 -->
-  <add key="MailUserName" value="" />
-  <!-- 发出邮箱的密码 -->
-  <add key="MailPassword" value="" />
-  <!-- 发出邮箱设置邮箱主机 -->
-  <add key="MailHost" value="" />
-  <!-- ================== 6：即时通信参数 ================== -->
-  <!-- SignalR服务接口-->
-  <add key="IMUrl" value="http://192.168.2.126:8012/signalr" />
-  <add key="userKey" value="14B417B0-463D-4F2B-8075-0A20EEDB773A" />
-  <!-- ==================注意附件上传地址  修改到部署目录下的Resource要不然飞星会报错================== -->
-  <add key="AnnexesFile" value="D:\leiprojects\西昌单校区\Learun.Application.Web\Resource" />
-  <!-- ================== 8：流程服务地址 ================== -->
-  <add key="workflowapi" value="http://localhost:8013" />
-  <!--Redis 缓存前缀 -->
-  <add key="RedisPrev" value="LRADMS" />
-  <!--head 头像存储地址 -->
-  <add key="fileHeadImg" value="C:/fileHeadImg" />
-  <add key="fileAppDTImg" value="C:/fileAppDTImg" />
-  <add key="fileLogoImg" value="C:/fileLogoImg" />
-  <!-- ================== 9：禁用BrowserLink，解决进度条卡在99%问题 ================== -->
-  <add key="vs:EnableBrowserLink" value="false"/>
-  <!--获取高职版跳转地址url -->
-  <add key="DigitalschoolMisLoginurl" value="http://192.168.2.126:9000/LoginHandler.ashx"/>
-  <!--<add key="DigitalschoolMisLoginurl" value="http://123.57.209.16:9000/LoginHandler.ashx"/>-->
-  <!-- ================== 默认密码 ================== -->
-  <add key="defaultpwd" value="123456" />
-  <add key="defaultpwdeight" value="abc123**" />
-  <!-- ================== 统一身份认证公钥密钥 ================== -->
-  <add key="SSOPublicSecret" value="bjquanjiang" />
-  <add key="SSOUserSecret" value="123456789" />
-  <!-- ================== 飞星通讯地址 下发新闻用 ================== -->
-  <!--<add key="CommunicationServeraddress" value="http://127.0.0.1:8866/ChatConnection" />-->
-  <add key="CommunicationServeraddress" value="http://123.57.209.16:8866/ChatConnection" />
-  <!-- ================== 默认头像 ================== -->
-  <add key="defaultheadimg" value="/Content/images/head/on-boy.jpg" />
-  <!--排课接口-->
-  <add key="ArrangeLessonAPI" value="http://112.45.152.8:9002/interface/paike/paike" />
-  <!--初始化排课接口-->
-  <add key="ModifyArrangeLessonAPI" value="http://112.45.152.8:9002/interface/paike/updatePaike" />
-  <!--开课计划接口-->
-  <add key="OpenLessonPlanAPI" value="http://112.45.152.8:9002/interface/paike/majorInterface" />
-
-  <!--选修排课接口-->
-  <add key="ArrangeLessonOfElectiveAPI" value="http://112.45.152.8:9002/interface/paike/xuanxiupaike" />
-  <!--初始化选修排课接口-->
-  <add key="ModifyArrangeLessonOfElectiveAPI" value="http://112.45.152.8:9002/interface/paike/updateXuanXiuPaike" />
-
-  <!--排考接口-->
-  <add key="ArrangeExamAPI" value="http://112.45.152.8:9002/interface/paikao/paikao" />
-  <!--选修排考接口-->
-  <add key="ArrangeExamOfElectiveAPI" value="http://112.45.152.8:9002/interface/paikao/xuanxiupaikao" />
-  <!--排考结构接口-->
-  <add key="ArrangeExamStructureAPI" value="http://112.45.152.8:9002/interface/paikao/geitime" />
-  <!--考试成绩接口-->
-  <add key="ExamScoreAPI" value="http://123.57.209.16:12203/jeeplus/app/stuScore" />
-
-  <!--考试系统学生端-->
-  <add key="kaoshisystemurl" value="http://ks.bjquanjiang.com/RereClientConnector" />
-  <!--批量生成学生帐号时默认的角色Id-->
-  <add key="GenerateStudentsRoleId" value="0cfc388c-80e6-4cf0-b53b-02201827490a" />
-  <!--批量生成教师帐号时默认的角色Id-->
-  <add key="GenerateTeachersRoleId" value="e1702746-185a-4480-8f19-3892066555cf" />
-  <add key="QingJuurl" value="http://xy.bjquanjiang.com/Student/LoginForSSOHandler.ashx" />
-  <add key="QingJuRegisterurl" value="http://xy.bjquanjiang.com/Service/ServiceStudent.ashx" />
-  <add key="dbbackuppath" value="D:\数字化校园\lr7test\Publish\Resource\DataBaseBackup"/>
-
-  <!-- 报名选修课排队需要调用的WebApi -->
-  <add key="WebApi" value="http://localhost:8061/" />
-  <!-- 河南对接登录 -->
-  <add key="appid" value="TZ6RW1DUNIN6C5M88I" />
-  <add key="secret" value="55848ef07e0f4e0c991bc8b4426100b2" />
-  <add key="redirecturl" value="http://123.6.9.199:6060/Login/SSOLogin" />
-</appSettings>
\ No newline at end of file
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 4c61d0f2b..be6bbb201 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.TwoDevelopment/EducationalAdministration/Sys_ReceiveDocument/Sys_ReceiveDocumentEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveDocument/Sys_ReceiveDocumentEntity.cs
index 1f6d968f5..bf9a5c81e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveDocument/Sys_ReceiveDocumentEntity.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveDocument/Sys_ReceiveDocumentEntity.cs	
@@ -89,7 +89,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         {
             var loginUser = LoginUserInfo.Get();
             this.RID = Guid.NewGuid().ToString();
-            this.RFile = Guid.NewGuid().ToString();
             this.SenderId = loginUser.userId;
             this.RSendFlag = "0";
         }
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Workflow/Learun.Workflow.Engine/NWFEngine.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Workflow/Learun.Workflow.Engine/NWFEngine.cs
index c360041bf..612e38dee 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Workflow/Learun.Workflow.Engine/NWFEngine.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Workflow/Learun.Workflow.Engine/NWFEngine.cs	
@@ -303,7 +303,16 @@ namespace Learun.Workflow.Engine
             }
             else
             {
-                line = wfScheme.lines.FirstOrDefault(a => a.from == nodeId);
+                List<NWFLineInfo> listLine = new List<NWFLineInfo>();
+                listLine = wfScheme.lines.Where(a => a.from == nodeId).ToList();
+                if (listLine.Count > 1)
+                {
+                    line = wfScheme.lines.FirstOrDefault(a => a.from == nodeId && a.agreeList == code);
+                }
+                else
+                {
+                    line = listLine.FirstOrDefault();
+                }
             }