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 1/4] =?UTF-8?q?=E5=85=AC=E6=96=87=E6=8E=A5=E6=94=B6?=
 =?UTF-8?q?=E4=BC=98=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();
+                }
             }
 
 

From 8de7ba462bdfe8406fb96e46d929ce615668ecd4 Mon Sep 17 00:00:00 2001
From: dyy <18335927079@163.com>
Date: Mon, 28 Sep 2020 11:02:20 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E6=8A=A5=E5=88=B0=E4=BA=8C=E7=BB=B4=E7=A0=81?=
 =?UTF-8?q?=EF=BC=9A=E8=80=81=E5=B8=88=E6=98=BE=E7=A4=BA=E4=B8=BA=E6=9F=90?=
 =?UTF-8?q?=E8=80=81=E5=B8=88=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StuInfoFresh/RegisterQRCode/RegisterQRCode.js   | 13 +++++--------
 .../XmlConfig/database.config                       |  8 ++++----
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.js
index ad02f4cf6..555a73aad 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.js	
@@ -10,10 +10,8 @@
 
             //数据绑定 
             learun.layer.loading(true, '获取数据中');
-            // learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntity", userinfo.baseinfo.account, (data) => {
-            learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntity", '2019010102', (data) => {
+            learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntity", userinfo.baseinfo.account, (data) => {
                 if (data) {
-                    console.log(data);
                     //判断是否显示报到二维码：未确认报到，且已完善信息，且缴费三有一；
                     var entity = data["StuInfoFreshEntity"];
                     if (entity.RegisterStatus == "1") {
@@ -43,18 +41,17 @@
                     $('.sQrList strong').eq(1).html(data.StuInfoFreshEntity.DeptNo);
                     $('.sQrList strong').eq(2).html(data.StuInfoFreshEntity.MajorNo);
                     $('.sQrList strong').eq(3).html(data.StuInfoFreshEntity.ClassNo);
+                    $('.sQrList strong').eq(4).html(data.StuInfoFreshEntity.DefaultClassRoomName);
                     //班主任
-                    $('.sQrText span').eq(0).html(data.StuInfoFreshEntity.ClassDiredctorName);
+                    $('.sQrText span').eq(0).html(data.StuInfoFreshEntity.ClassDiredctorName != null ? data.StuInfoFreshEntity.ClassDiredctorName.slice(0, 1) + "老师" : "");
                     $('.sQrText span').eq(1).html(data.StuInfoFreshEntity.ClassDiredctorMobile);
                     //辅导员
-                    $('.sQrText span').eq(2).html(data.StuInfoFreshEntity.ClassTutorName);
+                    $('.sQrText span').eq(2).html(data.StuInfoFreshEntity.ClassTutorName != null ? data.StuInfoFreshEntity.ClassTutorName.slice(0, 1) + "老师" : "");
                     $('.sQrText span').eq(3).html(data.StuInfoFreshEntity.ClassTutorMobile);
-                    // $('#sQrList strong').eq(0).html(data.StuInfoFreshEntity.StuName);
                     //二维码
-                    // learun.code.encode({ id: 'Img', text: userinfo.baseinfo.account });
                     learun.code.encode({ id: 'lr_mycode_qrcode', text: data.StuInfoFreshEntity.StuNo });
 
-                  
+
 
                     learun.layer.loading(false);
                 }
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 be6bbb201..4c61d0f2b 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" />

From bdfd92308ecad92d1b8b6010122167fd2f5181ee Mon Sep 17 00:00:00 2001
From: zhichao lei <442149704@qq.com>
Date: Mon, 28 Sep 2020 16:31:28 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E8=A1=8C=E6=94=BF=E5=85=AC=E6=96=87?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E5=8E=9F=E6=A0=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/Sys_SendFile/Form.cshtml            |  26 ++-
 .../Views/Sys_SendFile/Form.js                | 194 +++++++++++++++++-
 .../Views/Sys_SendFile/FormView.cshtml        |  20 +-
 .../Views/Sys_SendFile/FormView.js            |  25 +--
 .../Views/Sys_SendFile/Index.cshtml           |   6 +-
 .../Views/Sys_SendFile/Index.js               |  76 ++-----
 .../Views/Sys_SendFile/ReadList.cshtml        |   3 +-
 .../Views/Sys_SendFile/ReadList.js            |  69 -------
 .../Views/NWFProcess/htPrint.cshtml           |   5 +-
 .../EmpInfo/EmpInfoService.cs                 |   2 +
 .../Sys_SendFile/Sys_SendFileService.cs       | 167 +++++++++++++--
 11 files changed, 417 insertions(+), 176 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Form.cshtml
index b266ec6c7..6312927ed 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Form.cshtml	
@@ -7,14 +7,26 @@
         <div class="lr-form-item-title">主题<font face="宋体">*</font></div>
         <input id="Title" type="text" class="form-control"   isvalid="yes" checkexpession="NotNull" />
     </div>
-    @*<div class="col-xs-12 lr-form-item"  data-table="Sys_SendFile"   id="ReceiverIddiv">
-        <div class="lr-form-item-title">已接收人<font face="宋体">*</font></div>
-        <div id="ReceiverId"  ></div>
+    <div class="col-xs-12 lr-form-item"  data-table="Sys_SendFile" >
+        <div class="lr-form-item-title">接收对象<font face="宋体">*</font></div>
+        <div id="SendType" isvalid="yes" checkexpession="NotNull" ></div>
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="Sys_SendFile"   id="ReceiverIddiv">
-        <div class="lr-form-item-title">未接收人<font face="宋体">*</font></div>
-        <div id="NoReceiver"  ></div>
-    </div>*@
+        <div class="lr-form-item-title">接收人<font face="宋体">*</font></div>
+        <div id="ReceiverUserId"  ></div>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="Sys_SendFile"  id="DeptIddiv">
+        <div class="lr-form-item-title">接收部门<font face="宋体">*</font></div>
+        <div id="DeptId"  ></div>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="Sys_SendFile"  id="PostIddiv">
+        <div class="lr-form-item-title">接收岗位<font face="宋体">*</font></div>
+        <div id="PostId"  ></div>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="Sys_SendFile"  id="CompanyIddiv">
+        <div class="lr-form-item-title">接收校区<font face="宋体">*</font></div>
+        <div id="CompanyId"  ></div>
+    </div>
     <div class="col-xs-12 lr-form-item"  data-table="Sys_SendFile" >
         <div class="lr-form-item-title">文件</div>
         <div id="Url"  ></div>
@@ -24,4 +36,4 @@
         <div id="Contents" style="height:300px;"></div>
     </div>
 </div>
-@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_SendFile/Form.js")
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_SendFile/Form.js")
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Form.js
index 1985e9447..87802f8ab 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Form.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Form.js	
@@ -26,8 +26,70 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
-            //$('#ReceiverId').lrUserSelect({ type: '1' });
-            //$('#NoReceiver').lrUserSelect({ type: '1' });
+            $('#CompanyId').lrCompanySelect({ type: 'multiple' });
+            $('#DeptId').lrDepartmentSelect({ type: 'treemultiple' });
+            $('#PostId').lrPostSelect({ type: 'treemultiple' });
+            $('#ReceiverUserId').lrUserSelect({ type: '1' });
+            $('#SendType').lrDataItemSelect({
+                code: 'FileSendType', select: function (item) {
+                    if (item != null && item != undefined) {
+                        if (item.id === 1 || item.id === "1") {
+                            $("#CompanyIddiv").show();
+                            $("#CompanyId").attr("isvalid", "yes");
+                            $("#CompanyId").attr("checkexpession", "NotNull");
+                            $("#DeptIddiv").hide();
+                            $("#DeptId").removeAttr("isvalid");
+                            $("#DeptId").removeAttr("NotNull");
+                            $("#ReceiverIddiv").hide();
+                            $("#ReceiverUserId").removeAttr("isvalid");
+                            $("#ReceiverUserId").removeAttr("NotNull");
+                            $("#PostIddiv").hide();
+                            $("#PostId").removeAttr("isvalid");
+                            $("#PostId").removeAttr("NotNull");
+                        } else if (item.id === 2 || item.id === "2") {
+                            $("#CompanyIddiv").hide();
+                            $("#CompanyId").removeAttr("isvalid");
+                            $("#CompanyId").removeAttr("NotNull");
+                            $("#DeptIddiv").show();
+                            $("#DeptId").attr("isvalid", "yes");
+                            $("#DeptId").attr("checkexpession", "NotNull");
+                            $("#ReceiverIddiv").hide();
+                            $("#ReceiverUserId").removeAttr("isvalid");
+                            $("#ReceiverUserId").removeAttr("NotNull");
+                            $("#PostIddiv").hide();
+                            $("#PostId").removeAttr("isvalid");
+                            $("#PostId").removeAttr("NotNull");
+                        } else if (item.id === 3 || item.id === "3") {
+                            $("#CompanyIddiv").hide();
+                            $("#CompanyId").removeAttr("isvalid");
+                            $("#CompanyId").removeAttr("NotNull");
+                            $("#DeptIddiv").hide();
+                            $("#DeptId").removeAttr("isvalid");
+                            $("#DeptId").removeAttr("NotNull");
+                            $("#ReceiverIddiv").hide();
+                            $("#ReceiverUserId").removeAttr("isvalid");
+                            $("#ReceiverUserId").removeAttr("NotNull");
+                            $("#PostIddiv").show();
+                            $("#PostId").attr("isvalid", "yes");
+                            $("#PostId").attr("checkexpession", "NotNull");
+                        } else {
+                            $("#CompanyIddiv").hide();
+                            $("#CompanyId").removeAttr("isvalid");
+                            $("#CompanyId").removeAttr("NotNull");
+                            $("#DeptIddiv").hide();
+                            $("#DeptId").removeAttr("isvalid");
+                            $("#DeptId").removeAttr("NotNull");
+                            $("#ReceiverIddiv").show();
+                            $("#ReceiverUserId").attr("isvalid", "yes");
+                            $("#ReceiverUserId").attr("checkexpession", "NotNull");
+                            $("#PostIddiv").hide();
+                            $("#PostId").removeAttr("isvalid");
+                            $("#PostId").removeAttr("NotNull");
+                        }
+                    }
+                }
+            });
+            $('#SendType').lrselectSet("1");
             $('#Url').lrUploader();
             var ContentsUE = UE.getEditor('Contents');
             $('#Contents')[0].ue = ContentsUE;
@@ -41,6 +103,63 @@ var bootstrap = function ($, learun) {
                         }
                         else {
                             $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                            if (data[id].SendType === 1 || data[id].SendType == "1") {
+                                $("#CompanyIddiv").show();
+                                $("#CompanyId").attr("isvalid", "yes");
+                                $("#CompanyId").attr("checkexpession", "NotNull");
+                                $("#DeptIddiv").hide();
+                                $("#DeptId").removeAttr("isvalid");
+                                $("#DeptId").removeAttr("NotNull");
+                                $("#ReceiverIddiv").hide();
+                                $("#ReceiverUserId").removeAttr("isvalid");
+                                $("#ReceiverUserId").removeAttr("NotNull");
+                                $("#PostIddiv").hide();
+                                $("#PostId").removeAttr("isvalid");
+                                $("#PostId").removeAttr("NotNull");
+                                $("#CompanyId").lrselectSet(data[id].ReceiverId);
+                            } else if (data[id].SendType === 2 || data[id].SendType == "2") {
+                                $("#CompanyIddiv").hide();
+                                $("#CompanyId").removeAttr("isvalid");
+                                $("#CompanyId").removeAttr("NotNull");
+                                $("#DeptIddiv").show();
+                                $("#DeptId").attr("isvalid", "yes");
+                                $("#DeptId").attr("checkexpession", "NotNull");
+                                $("#ReceiverIddiv").hide();
+                                $("#ReceiverUserId").removeAttr("isvalid");
+                                $("#ReceiverUserId").removeAttr("NotNull");
+                                $("#PostIddiv").hide();
+                                $("#PostId").removeAttr("isvalid");
+                                $("#PostId").removeAttr("NotNull");
+                                $("#DeptId").lrselectSet(data[id].ReceiverId);
+                            } else if (data[id].SendType === 3 || data[id].SendType === "3") {
+                                $("#CompanyIddiv").hide();
+                                $("#CompanyId").removeAttr("isvalid");
+                                $("#CompanyId").removeAttr("NotNull");
+                                $("#DeptIddiv").hide();
+                                $("#DeptId").removeAttr("isvalid");
+                                $("#DeptId").removeAttr("NotNull");
+                                $("#ReceiverIddiv").hide();
+                                $("#ReceiverUserId").removeAttr("isvalid");
+                                $("#ReceiverUserId").removeAttr("NotNull");
+                                $("#PostIddiv").show();
+                                $("#PostId").attr("isvalid", "yes");
+                                $("#PostId").attr("checkexpession", "NotNull");
+                                $("#PostId").lrselectSet(data[id].ReceiverId);
+                            } else {
+                                $("#CompanyIddiv").hide();
+                                $("#CompanyId").removeAttr("isvalid");
+                                $("#CompanyId").removeAttr("NotNull");
+                                $("#DeptIddiv").hide();
+                                $("#DeptId").removeAttr("isvalid");
+                                $("#DeptId").removeAttr("NotNull");
+                                $("#ReceiverIddiv").show();
+                                $("#ReceiverUserId").attr("isvalid", "yes");
+                                $("#ReceiverUserId").attr("checkexpession", "NotNull");
+                                $("#PostIddiv").hide();
+                                $("#PostId").removeAttr("isvalid");
+                                $("#PostId").removeAttr("NotNull");
+                                $("#ReceiverUserId").lrformselectSet(data[id].ReceiverId);
+                            }
                         }
                     }
 
@@ -61,6 +180,63 @@ var bootstrap = function ($, learun) {
                             keyValue = data[id].SFileId;
                         }
                         $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        if (data[id].SendType === 1 || data[id].SendType == "1") {
+                            $("#CompanyIddiv").show();
+                            $("#CompanyId").attr("isvalid", "yes");
+                            $("#CompanyId").attr("checkexpession", "NotNull");
+                            $("#DeptIddiv").hide();
+                            $("#DeptId").removeAttr("isvalid");
+                            $("#DeptId").removeAttr("NotNull");
+                            $("#ReceiverIddiv").hide();
+                            $("#ReceiverUserId").removeAttr("isvalid");
+                            $("#ReceiverUserId").removeAttr("NotNull");
+                            $("#PostIddiv").hide();
+                            $("#PostId").removeAttr("isvalid");
+                            $("#PostId").removeAttr("NotNull");
+                            $("#CompanyId").lrselectSet(data[id].ReceiverId);
+                        } else if (data[id].SendType === 2 || data[id].SendType == "2") {
+                            $("#CompanyIddiv").hide();
+                            $("#CompanyId").removeAttr("isvalid");
+                            $("#CompanyId").removeAttr("NotNull");
+                            $("#DeptIddiv").show();
+                            $("#DeptId").attr("isvalid", "yes");
+                            $("#DeptId").attr("checkexpession", "NotNull");
+                            $("#ReceiverIddiv").hide();
+                            $("#ReceiverUserId").removeAttr("isvalid");
+                            $("#ReceiverUserId").removeAttr("NotNull");
+                            $("#PostIddiv").hide();
+                            $("#PostId").removeAttr("isvalid");
+                            $("#PostId").removeAttr("NotNull");
+                            $("#DeptId").lrselectSet(data[id].ReceiverId);
+                        } else if (data[id].SendType === 3 || data[id].SendType === "3") {
+                            $("#CompanyIddiv").hide();
+                            $("#CompanyId").removeAttr("isvalid");
+                            $("#CompanyId").removeAttr("NotNull");
+                            $("#DeptIddiv").hide();
+                            $("#DeptId").removeAttr("isvalid");
+                            $("#DeptId").removeAttr("NotNull");
+                            $("#ReceiverIddiv").hide();
+                            $("#ReceiverUserId").removeAttr("isvalid");
+                            $("#ReceiverUserId").removeAttr("NotNull");
+                            $("#PostIddiv").show();
+                            $("#PostId").attr("isvalid", "yes");
+                            $("#PostId").attr("checkexpession", "NotNull");
+                            $("#PostId").lrselectSet(data[id].ReceiverId);
+                        } else {
+                            $("#CompanyIddiv").hide();
+                            $("#CompanyId").removeAttr("isvalid");
+                            $("#CompanyId").removeAttr("NotNull");
+                            $("#DeptIddiv").hide();
+                            $("#DeptId").removeAttr("isvalid");
+                            $("#DeptId").removeAttr("NotNull");
+                            $("#ReceiverIddiv").show();
+                            $("#ReceiverUserId").attr("isvalid", "yes");
+                            $("#ReceiverUserId").attr("checkexpession", "NotNull");
+                            $("#PostIddiv").hide();
+                            $("#PostId").removeAttr("isvalid");
+                            $("#PostId").removeAttr("NotNull");
+                            $("#ReceiverUserId").lrformselectSet(data[id].ReceiverId);
+                        }
                     }
                 }
             });
@@ -76,6 +252,20 @@ var bootstrap = function ($, learun) {
     // 保存数据
     save = function (processId, callBack, i) {
         var formData = $('body').lrGetFormData();
+        var sendtype = $('#SendType').lrselectGet();
+        if (sendtype == "1") {
+            formData.ReceiverId = $("#CompanyId").lrselectGet();
+            formData.Receiver = $("#CompanyId").find(".lr-select-placeholder").text();
+        } else if (sendtype == "2") {
+            formData.ReceiverId = $("#DeptId").lrselectGet();
+            formData.Receiver = $("#DeptId").find(".lr-select-placeholder").text();
+        } else if (sendtype == "3") {
+            formData.ReceiverId = $("#PostId").lrselectGet();
+            formData.Receiver = $("#PostId").find(".lr-select-placeholder").text();
+        } else {
+            formData.ReceiverId = $("#ReceiverUserId").lrformselectGet();
+            formData.Receiver = $("#ReceiverUserId").find("span").text();
+        }
         if (!!processId) {
             formData.SProcessId = processId;
         }
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormView.cshtml
index 0f8eb81cf..70dba3553 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormView.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormView.cshtml	
@@ -3,17 +3,25 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap" id="form">
-    <div class="col-xs-12 lr-form-item" data-table="Sys_SendFile">
+    <div class="col-xs-12 lr-form-item"  data-table="Sys_SendFile" >
         <div class="lr-form-item-title">主题<font face="宋体">*</font></div>
-        <input id="Title" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <input id="Title" type="text" class="form-control"   isvalid="yes" checkexpession="NotNull" readonly="readonly" />
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="Sys_SendFile">
+    <div class="col-xs-12 lr-form-item"  data-table="Sys_SendFile" >
+        <div class="lr-form-item-title">接收对象<font face="宋体">*</font></div>
+        <div id="SendType" isvalid="yes" checkexpession="NotNull"  readonly="readonly" ></div>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="Sys_SendFile"   id="ReceiverIddiv">
+        <div class="lr-form-item-title">接收人<font face="宋体">*</font></div>
+        <input id="Receiver"  type="text" class="form-control" readonly="readonly" />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="Sys_SendFile" >
         <div class="lr-form-item-title">文件</div>
-        <div id="Url" readonly="readonly" style="padding-right: 60px;"></div>
+        <div id="Url"   readonly="readonly" style="padding-right: 60px;"></div>
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="Sys_SendFile">
+    <div class="col-xs-12 lr-form-item"  data-table="Sys_SendFile" >
         <div class="lr-form-item-title">正文</div>
         <div id="Contents" style="height:300px; margin-top: 6px;"></div>
     </div>
 </div>
-@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_SendFile/FormView.js")
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_SendFile/FormView.js")
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormView.js
index 0ceb8014a..e604d9df6 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormView.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormView.js	
@@ -27,6 +27,9 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
+            $('#SendType').lrDataItemSelect({
+                code: 'FileSendType'
+            });
             $('#Url').lrUploader();
             var ContentsUE = UE.getEditor('Contents');
             $('#Contents')[0].ue = ContentsUE;
@@ -78,21 +81,13 @@ var bootstrap = function ($, learun) {
     };
     // 保存数据
     save = function (processId, callBack, i) {
-
-        var formData = $('body').lrGetFormData();
-        var postData = {
-            strEntity: JSON.stringify(formData)
-        };
-        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/Sys_SendFile/SaveForm?keyValue=' + keyValue, postData, function (res) {
-            // 保存成功后才回调
-            if (!!callBack) {
-                callBack(res, i);
-            }
-        });
-
-
-
-
+        var formData = {};
+        var res = {};
+        res.code = 200;
+        if (!!processId) {
+            formData.SProcessId = processId;
+        }
+        callBack(res, i);
     };
     page.init();
 }
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.cshtml
index f97bd71d4..820e37035 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.cshtml	
@@ -29,10 +29,8 @@
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
                         <a id="lr_submit" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 提交</a>
-                        <a id="lr_view" class="btn btn-default"><i class="fa fa-search-minus"></i>&nbsp; 查看</a>
-                        <a id="lr_IssueSpecifyReceiver" class="btn btn-default"><i class="fa fa-envelope"></i>&nbsp;下发审批指定接收人</a>
-                        <a id="lr_OverIssue" class="btn btn-default"><i class="fa fa-minus-square"></i>&nbsp;结束下发</a>
-                        <a id="lr_read" class="btn btn-default"><i class="fa fa-calendar-minus-o"></i>&nbsp; 查阅情况</a>
+                        <a id="lr_view" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp; 查看</a>
+                        <a id="lr_read" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp; 查阅情况</a>
                     </div>
                 </div>
             </div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.js
index c2b347179..eb523302a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.js	
@@ -138,51 +138,6 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
-
-            // 下发审批指定接收人
-            $('#lr_IssueSpecifyReceiver').on('click', function () {
-                var keyValue = $('#gridtable').jfGridValue('SFileId');
-                if (learun.checkrow(keyValue)) {
-                    learun.layerForm({
-                        id: 'form',
-                        title: '下发审批指定接收人',
-                        url: top.$.rootUrl + '/EducationalAdministration/Sys_SendFile/IssueForm?keyValue=' + keyValue,
-                        width: 800,
-                        height: 200,
-                        callBack: function (id) {
-                            var res = false;
-                            // 验证数据
-                            res = top[id].validForm();
-                            // 保存数据
-                            if (res) {
-                                res = top[id].save('', function () {
-                                    page.search();
-                                });
-                            }
-                            return res;
-                        }
-                    });
-                }
-            });
-            // 结束
-            $('#lr_OverIssue').on('click', function () {
-                var keyValue = $('#gridtable').jfGridValue('SFileId');
-                if (learun.checkrow(keyValue)) {
-                    var SendFlag = $('#gridtable').jfGridValue('SendFlag');
-                    if (SendFlag !== 2) {
-                        learun.alert.warning("当前公文未审批通过，请耐心等待审批！");
-                        return;
-                    }
-                    learun.layerConfirm('是否结束下发！', function (res) {
-                        if (res) {
-                            processId = learun.newGuid();
-                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/Sys_SendFile/OverIssue', { keyValue: keyValue, }, function (res) {
-                                refreshGirdData(res, {});
-                            });
-                        }
-                    });
-                }
-            });
         },
         // 初始化列表
         initGird: function () {
@@ -190,21 +145,34 @@ var bootstrap = function ($, learun) {
                 url: top.$.rootUrl + '/EducationalAdministration/Sys_SendFile/GetPageList',
                 headData: [
                     { label: "主题", name: "Title", width: 300, align: "left" },
-                    { label: "已接收", name: "Receiver", width: 300, align: "left" },
-                    { label: "审批意见", name: "SpecifyReceiver", width: 300, align: "left" },
-                    { label: "下发人", name: "Sender", width: 100, align: "left" },
-                    { label: "下发时间", name: "SendTime", width: 150, align: "left" },
+                    {
+                        label: "接收对象", name: "SendType", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'FileSendType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "接收人", name: "Receiver", width: 300, align: "left"
+                    },
+                    {
+                        label: "下发人", name: "Sender", width: 100, align: "left"
+                    },
+                    {
+                        label: "下发时间", name: "SendTime", width: 150, align: "left"
+                    },
                     {
                         label: "状态", name: "SendFlag", width: 100, align: "left",
                         formatter: function (cellvalue, row) {
                             if (cellvalue === 1) {
                                 return '<span class=\"label label-warning\">审批中</span>';
                             } else if (cellvalue === 2) {
-                                return '<span class=\"label label-info\">审批通过</span>';
-                            } else if (cellvalue === 3) {
-                                return '<span class=\"label label-danger\" >审批失败</span>';
-                            } else if (cellvalue === 4) {
-                                return '<span class=\"label label-success\" >下发完毕</span>';
+                                return '<span class=\"label label-success\">已下发</span>';
                             } else {
                                 return '<span class=\"label label-default\" >草稿</span>';
                             }
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/ReadList.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/ReadList.cshtml
index 7321389a5..d3f0e2c7a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/ReadList.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/ReadList.cshtml	
@@ -17,7 +17,6 @@
                 <div class="lr-layout-tool-right">
                     <div class=" btn-group btn-group-sm">
                         <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
-                        <a id="lr_Issue" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;下发</a>
                     </div>
 
                 </div>
@@ -26,4 +25,4 @@
         </div>
     </div>
 </div>
-@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_SendFile/ReadList.js")
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_SendFile/ReadList.js")
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/ReadList.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/ReadList.js
index 65148062e..da100e6ee 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/ReadList.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/ReadList.js	
@@ -24,40 +24,6 @@ var bootstrap = function ($, learun) {
             $('#lr_refresh').on('click', function () {
                 location.reload();
             });
-
-            $('#lr_Issue').on('click',
-                function () {
-                    var keyValue = $('#gridtable').jfGridValue('SFileId');
-                    var rFileId = $('#gridtable').jfGridValue('RFileId');
-                    var specifyReceiver = $('#gridtable').jfGridValue('SpecifyReceiver');
-                    if (learun.checkrow(rFileId)) {
-                        var SendStatus = $('#gridtable').jfGridValue('SendStatus');
-                        if (SendStatus) {
-                            learun.alert.warning("已下发！");
-                            return;
-                        }
-                        learun.layerForm({
-                            id: 'formIssue',
-                            title: '下发',
-                            url: top.$.rootUrl + '/EducationalAdministration/Sys_SendFile/IssueForm?keyValue=' + keyValue + '&rFileId=' + rFileId + '&specifyReceiver=' + specifyReceiver,
-                            width: 500,
-                            height: 500,
-                            callBack: function (id) {
-                                var res = false;
-                                // 验证数据
-                                res = top[id].validForm();
-                                // 保存数据
-                                if (res) {
-                                    res = top[id].save('', function () {
-                                        page.search();
-                                    });
-                                }
-                                return res;
-                            }
-                        });
-                    }
-
-                });
         },
         // 初始化列表
         initGird: function () {
@@ -70,30 +36,6 @@ var bootstrap = function ($, learun) {
                     {
                         label: "查阅时间", name: "ReadTime", width: 150, align: "left"
                     },
-                    {
-                        label: "指定接收人", name: "SpecifyReceiver", width: 150, align: "left", formatterAsync:
-                            function (callback, value, row, op, $cell) {
-                                learun.clientdata.getAsync('user',
-                                    {
-                                        key: value,
-                                        callback: function (_data) {
-                                            if (_data.length > 0) {
-                                                var text = '';
-                                                $.each(_data,
-                                                    function (i, item) {
-                                                        if (item) {
-                                                            text += item.name + ',';
-                                                        }
-                                                    });
-                                                text = text.substring(0, text.lastIndexOf(','));
-                                                callback(text);
-                                            } else {
-                                                callback(_data.name);
-                                            }
-                                        }
-                                    });
-                            }
-                    },
                     {
                         label: "状态", name: "ReadFlag", width: 100, align: "left",
                         formatter: function (cellvalue, row) {
@@ -103,16 +45,6 @@ var bootstrap = function ($, learun) {
                                 return '<span class=\"label label-warning\">未读</span>';
                             }
                         }
-                    },
-                    {
-                        label: "下发状态", name: "SendStatus", width: 100, align: "left",
-                        formatter: function (cellvalue, row) {
-                            if (cellvalue === true) {
-                                return '<span class=\"label label-success\">已下发</span>';
-                            } else {
-                                return '<span class=\"label label-warning\">未下发</span>';
-                            }
-                        }
                     }
                 ],
                 mainId: 'RFileId',
@@ -125,7 +57,6 @@ var bootstrap = function ($, learun) {
         search: function (param) {
             param = param || {};
             param.SFileId = keyValue;
-            param.STypeId = 1;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/htPrint.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/htPrint.cshtml
index bd37293b2..f19e0fd41 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/htPrint.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/htPrint.cshtml	
@@ -27,7 +27,6 @@
                     被委托人：<span>@ViewBag.UserName</span>(身份证号码：<span style="width: 237px;">@ViewBag.IDCard</span>)
                 </div>
                 <div class="entrTxt">
-                    (签字)
                 </div>
                 <div class="entrTxt">
                     委托人：<span>关亮</span>(身份证号码：<span style="width: 237px;">110111196506121035</span>)
@@ -57,8 +56,8 @@
 </html>
 <script>
     //盖章图片
-    var stampUrl = '/LR_NewWorkFlow/StampInfo/GetImg?keyValue=00324dc8-e0db-457f-b078-ebd1aac46463';// + @ViewBag.StampImg;
-    var signUrl = '/LR_SystemModule/Img/GetImg?keyValue=90ddf143-ba5a-4900-b9c5-96fb3336d4a7';// + @ViewBag.SignImg;
+    var stampUrl = '/LR_NewWorkFlow/StampInfo/GetImg?keyValue=@ViewBag.StampImg';
+    var signUrl = '/LR_SystemModule/Img/GetImg?keyValue=@ViewBag.SignImg';
     $('#signImg').attr('src', signUrl);
     $('#stampImg').attr('src', stampUrl);
 
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs
index 3977cdeac..5412a82c5 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs	
@@ -603,6 +603,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     {
                         baseUser.F_HeadIcon = url;
                         baseUser.F_RealName = entity.EmpName;
+                        baseUser.F_IdentityCardNo = entity.IdentityCardNo;
+                        baseUser.F_Mobile = entity.mobile;
                         userIBLL.SaveEntity(baseUser.F_UserId, baseUser);
                     }
                 }
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendFile/Sys_SendFileService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendFile/Sys_SendFileService.cs
index 0db9bf5ae..0b85f8889 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendFile/Sys_SendFileService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendFile/Sys_SendFileService.cs	
@@ -228,24 +228,163 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="status"></param>
         public void ChangeStatusByProcessId(string processId, int status)
         {
-            var db = BaseRepository().BeginTrans();
-            try
+            if (status == 2)
             {
-                var Sys_SendFile = db.FindEntity<Sys_SendFileEntity>(m => m.SProcessId == processId);
-                Sys_SendFile.SendFlag = status;
-
-                //获取校长的审批意见
-                if (status == 2)
+                var db = BaseRepository().BeginTrans();
+                try
                 {
+                    var needpostuserlist = new List<UserEntity>();
+                    var Sys_SendFile = db.FindEntity<Sys_SendFileEntity>(m => m.SProcessId == processId);
+                    if (Sys_SendFile.SendType == "1")
+                    {
+                        var teacherlist = db.FindList<UserEntity>(m =>
+                            m.F_DeleteMark != 1 && m.F_EnabledMark == 1 && m.F_Description == "教师" &&
+                            m.F_CompanyId == Sys_SendFile.ReceiverId);
+                        needpostuserlist = teacherlist.ToList();
+                        foreach (var tEntity in teacherlist)
+                        {
+                            Sys_ReceiveFileEntity receiveFile = new Sys_ReceiveFileEntity();
+                            receiveFile.Create();
+                            receiveFile.SFileId = Sys_SendFile.SFileId;
+                            receiveFile.SenderId = Sys_SendFile.SenderId;
+                            receiveFile.Sender = Sys_SendFile.Sender;
+                            receiveFile.ReceiverId = tEntity.F_UserId;
+                            receiveFile.Receiver = tEntity.F_RealName;
+                            receiveFile.Title = Sys_SendFile.Title;
+                            receiveFile.Contents = Sys_SendFile.Contents;
+                            receiveFile.Url = Sys_SendFile.Url;
+                            receiveFile.ReadFlag = false;
+                            receiveFile.SendTime = DateTime.Now;
+                            receiveFile.SendType = Sys_SendFile.SendType;
+                            receiveFile.DelFlag = false;
+                            receiveFile.STypeId = Sys_SendFile.STypeId;
+                            receiveFile.ReplyFlag = false;
+                            receiveFile.SLastDate = Sys_SendFile.SLastDate;
+                            receiveFile.RUrl = Guid.NewGuid().ToString();
+                            db.Insert(receiveFile);
+                        }
+                    }
+                    else if (Sys_SendFile.SendType == "2")
+                    {
+                        var teacherlist = db.FindList<UserEntity>(m =>
+                            m.F_DeleteMark != 1 && m.F_EnabledMark == 1 && m.F_Description == "教师" &&
+                            Sys_SendFile.ReceiverId.Contains(m.F_DepartmentId));
+                        needpostuserlist = teacherlist.ToList();
+                        foreach (var tEntity in teacherlist)
+                        {
+                            Sys_ReceiveFileEntity receiveFile = new Sys_ReceiveFileEntity();
+                            receiveFile.Create();
+                            receiveFile.SFileId = Sys_SendFile.SFileId;
+                            receiveFile.SenderId = Sys_SendFile.SenderId;
+                            receiveFile.Sender = Sys_SendFile.Sender;
+                            receiveFile.ReceiverId = tEntity.F_UserId;
+                            receiveFile.Receiver = tEntity.F_RealName;
+                            receiveFile.Title = Sys_SendFile.Title;
+                            receiveFile.Contents = Sys_SendFile.Contents;
+                            receiveFile.Url = Sys_SendFile.Url;
+                            receiveFile.ReadFlag = false;
+                            receiveFile.SendTime = DateTime.Now;
+                            receiveFile.SendType = Sys_SendFile.SendType;
+                            receiveFile.DelFlag = false;
+                            receiveFile.STypeId = Sys_SendFile.STypeId;
+                            receiveFile.ReplyFlag = false;
+                            receiveFile.SLastDate = Sys_SendFile.SLastDate;
+                            receiveFile.RUrl = Guid.NewGuid().ToString();
+                            db.Insert(receiveFile);
+                        }
+                    }
+                    else if (Sys_SendFile.SendType == "3")
+                    {
+                        List<string> ppostid = Sys_SendFile.ReceiverId.Split(',').ToList();
+                        for (int i = 0; i < ppostid.Count; i++)
+                        {
+                            ppostid[i] = "'" + ppostid[i] + "'";
+                        }
+
+                        var teacherlist = db.FindList<UserEntity>(
+                            @"select distinct a.* from [dbo].[LR_Base_User] a left join [dbo].[LR_Base_UserRelation] b
+on a.F_UserId=b.F_UserId where b.F_ObjectId in(" + string.Join(",", ppostid) +
+                            ") and a.F_DeleteMark<>1 and a.F_EnabledMark=1 and a.F_Description='教师'");
+                        needpostuserlist = teacherlist.ToList();
+                        foreach (var tEntity in teacherlist)
+                        {
+                            Sys_ReceiveFileEntity receiveFile = new Sys_ReceiveFileEntity();
+                            receiveFile.Create();
+                            receiveFile.SFileId = Sys_SendFile.SFileId;
+                            receiveFile.SenderId = Sys_SendFile.SenderId;
+                            receiveFile.Sender = Sys_SendFile.Sender;
+                            receiveFile.ReceiverId = tEntity.F_UserId;
+                            receiveFile.Receiver = tEntity.F_RealName;
+                            receiveFile.Title = Sys_SendFile.Title;
+                            receiveFile.Contents = Sys_SendFile.Contents;
+                            receiveFile.Url = Sys_SendFile.Url;
+                            receiveFile.ReadFlag = false;
+                            receiveFile.SendTime = DateTime.Now;
+                            receiveFile.SendType = Sys_SendFile.SendType;
+                            receiveFile.DelFlag = false;
+                            receiveFile.STypeId = Sys_SendFile.STypeId;
+                            receiveFile.ReplyFlag = false;
+                            receiveFile.SLastDate = Sys_SendFile.SLastDate;
+                            receiveFile.RUrl = Guid.NewGuid().ToString();
+                            db.Insert(receiveFile);
+                        }
+                    }
+                    else
+                    {
+                        var teacherlist = db.FindList<UserEntity>(m =>
+                            m.F_DeleteMark != 1 && m.F_EnabledMark == 1 && m.F_Description == "教师" &&
+                            Sys_SendFile.ReceiverId.Contains(m.F_UserId));
+                        needpostuserlist = teacherlist.ToList();
+                        foreach (var tEntity in teacherlist)
+                        {
+                            Sys_ReceiveFileEntity receiveFile = new Sys_ReceiveFileEntity();
+                            receiveFile.Create();
+                            receiveFile.SFileId = Sys_SendFile.SFileId;
+                            receiveFile.SenderId = Sys_SendFile.SenderId;
+                            receiveFile.Sender = Sys_SendFile.Sender;
+                            receiveFile.ReceiverId = tEntity.F_UserId;
+                            receiveFile.Receiver = tEntity.F_RealName;
+                            receiveFile.Title = Sys_SendFile.Title;
+                            receiveFile.Contents = Sys_SendFile.Contents;
+                            receiveFile.Url = Sys_SendFile.Url;
+                            receiveFile.ReadFlag = false;
+                            receiveFile.SendTime = DateTime.Now;
+                            receiveFile.SendType = Sys_SendFile.SendType;
+                            receiveFile.DelFlag = false;
+                            receiveFile.STypeId = Sys_SendFile.STypeId;
+                            receiveFile.ReplyFlag = false;
+                            receiveFile.SLastDate = Sys_SendFile.SLastDate;
+                            receiveFile.RUrl = Guid.NewGuid().ToString();
+                            db.Insert(receiveFile);
+                        }
+                    }
+                    Sys_SendFile.SendFlag = 2;
                     Sys_SendFile.SendTime = DateTime.Now;
+                    db.Update(Sys_SendFile);
+                    db.Commit();
+                    //微信推送
+                    try
+                    {
+                        PushWeixin(needpostuserlist, Sys_SendFile.Title);
+                    }
+                    catch (Exception e)
+                    {
+                    }
+                    //飞星推送
+                    Task.Run(async () =>
+                    {
+                        using (var hubConnection = new HubConnection(ConfigurationManager.AppSettings["CommunicationServeraddress"]))
+                        {
+                            var hubProxy = hubConnection.CreateHubProxy("SignalRHub");
+                            await hubConnection.Start();
+                            await hubProxy.Invoke("PushAnnouncement", Sys_SendFile.SenderId, Sys_SendFile.Title, Util.Str.ReplaceHtml(HttpUtility.HtmlDecode(Sys_SendFile.Contents)).Length < 20 ? Util.Str.ReplaceHtml(HttpUtility.HtmlDecode(Sys_SendFile.Contents)) : Util.Str.ReplaceHtml(HttpUtility.HtmlDecode(Sys_SendFile.Contents)).Substring(0, 20), "sendfile", string.Join(",", needpostuserlist.Select(m => m.F_UserId)), "");
+                        }
+                    });
+                }
+                catch (Exception ex)
+                {
+                    db.Rollback();
                 }
-                db.Update(Sys_SendFile);
-                db.Commit();
-
-            }
-            catch (Exception ex)
-            {
-                db.Rollback();
             }
         }
 

From 47fa6df8dcccbddc747d3cc71be1b14bf21733d0 Mon Sep 17 00:00:00 2001
From: dyy <18335927079@163.com>
Date: Mon, 28 Sep 2020 17:32:21 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?=
 =?UTF-8?q?=E5=8A=A9=E5=AD=A6=E8=B4=B7=E6=AC=BE=E7=8A=B6=E6=80=81=EF=BC=9A?=
 =?UTF-8?q?=E5=A1=AB=E5=86=99=E4=BA=86=E8=B4=B7=E6=AC=BE=E5=9B=9E=E6=89=A7?=
 =?UTF-8?q?=E7=A0=81=E5=90=8E=E9=BB=98=E8=AE=A4=E7=8A=B6=E6=80=81=E4=B8=BA?=
 =?UTF-8?q?=E5=B7=B2=E5=AE=A1=E6=A0=B8=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StuInfoFresh/PayFee/PayFee.js                | 16 ++++++++--------
 .../StuInfoFresh/PayFee/form/form.js             |  7 ++++++-
 .../StuInfoFresh/StudentLoan/StudentLoan.js      |  6 +++++-
 .../Views/StuInfoFresh/LoanForm.js               |  7 ++++++-
 .../Modules/StuInfoFreshApi.cs                   |  5 +++++
 5 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/PayFee.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/PayFee.js
index 27f07365d..81eebed9e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/PayFee.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/PayFee.js	
@@ -94,15 +94,15 @@
                 text: 'classname'
             }));
             _$item.append($('<p class="lr-ellipsis"><span>线上缴费状态:</span></p>').dataFormatter({
-                value: _item.PayFeeStatus,
-                type: 'dataItem',
-                code: 'PayStatus'
-            }));
-            _$item.append($('<p class="lr-ellipsis"><span>线上缴费时间:</span></p>').dataFormatter({
-                value: _item.PayFeeDate,
-                type: 'datetime',
-                dateformat: 'yyyy-MM-dd hh:mm:ss'
+                value: _item.PayFeeStatus == "1" ? "已缴费" : "未缴费"
+                //type: 'dataItem',
+                //code: 'PayStatus'
             }));
+            //_$item.append($('<p class="lr-ellipsis"><span>线上缴费时间:</span></p>').dataFormatter({
+            //    value: _item.PayFeeDate,
+            //    type: 'datetime',
+            //    dateformat: 'yyyy-MM-dd hh:mm:ss'
+            //}));
             _$item.append($('<p class="lr-ellipsis"><span>贷款回执码:</span></p>').dataFormatter({ value: _item.StudentLoan }));
             _$item.append($('<p class="lr-ellipsis"><span>助学贷款状态:</span></p>').dataFormatter({ value: _item.StudentLoanStatus == "1" ? "已审核" : "未审核" }));
             _$item.append($('<p class="lr-ellipsis"><span>现场缴费状态:</span></p>').dataFormatter({
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/form/form.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/form/form.js
index 05c2b3162..1b9f3015a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/form/form.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/form/form.js	
@@ -83,9 +83,14 @@
                 if (!$page.find('.lr-form-container').lrformValid()) {
                     return false;
                 }
+                var data = $page.find('.lr-form-container').lrformGet();
+                data.StudentLoanStatus = "0";
+                if ($('#StudentLoan').val().trim() != null && $('#StudentLoan').val().trim() != "" && $('#StudentLoan').val().trim() != undefined) {
+                    data.StudentLoanStatus = "1";
+                }
                 var _postData = {}
                 _postData.keyValue = keyValue;
-                _postData.strEntity = JSON.stringify($page.find('.lr-form-container').lrformGet());
+                _postData.strEntity = JSON.stringify(data);
                 learun.layer.loading(true, '正在提交数据');
                 learun.httppost(config.webapi + 'StuInfoFresh/save', _postData, (data) => {
                     learun.layer.loading(false);
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.js
index ac2289a21..a07fb1e1d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.js	
@@ -28,8 +28,12 @@
             $page.find('#saveBtn').on('tap', function () {
                 var postdata = {
                     ID: $('#ID').val(),
-                    StudentLoan: $('#StudentLoan').val()
+                    StudentLoan: $('#StudentLoan').val(),
+                    StudentLoanStatus: "0"
                 };
+                if ($('#StudentLoan').val().trim() != null && $('#StudentLoan').val().trim() != "" && $('#StudentLoan').val().trim() != undefined) {
+                    postdata.StudentLoanStatus = "1";
+                }
                 learun.httpget(config.webapi + "StuInfoFresh/saveLoan", postdata, (data) => {
                     if (data) {
                         learun.layer.toast('保存成功');
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/LoanForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/LoanForm.js
index f0399d93b..fb72bb734 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/LoanForm.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/LoanForm.js	
@@ -38,9 +38,14 @@ var bootstrap = function ($, learun) {
         if (!$('body').lrValidform()) {
             return false;
         }
+        var data = $('[data-table="StuInfoFresh"]').lrGetFormData();
+        data.StudentLoanStatus = "0";
+        if ($("#StudentLoan").val().trim() != null && $("#StudentLoan").val().trim() != "" && $("#StudentLoan").val().trim() != undefined) {
+            data.StudentLoanStatus = "1";
+        }
 
         var postData = {};
-        postData.strEntity = JSON.stringify($('[data-table="StuInfoFresh"]').lrGetFormData());
+        postData.strEntity = JSON.stringify(data);
         $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/SaveLoanForm?keyValue=' + keyValue, postData, function (res) {
             // 保存成功后才回调 
             if (!!callBack) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuInfoFreshApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuInfoFreshApi.cs
index 6b1d55c5b..486eb6066 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuInfoFreshApi.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuInfoFreshApi.cs	
@@ -198,6 +198,7 @@ namespace Learun.Application.WebApi.Modules
 
             var entity = stuInfoFreshIBLL.GetStuInfoFreshEntity(model.ID);
             entity.StudentLoan = model.StudentLoan;
+            entity.StudentLoanStatus = model.StudentLoanStatus;
 
             stuInfoFreshIBLL.SaveEntity(entity.ID, entity);
 
@@ -377,6 +378,10 @@ namespace Learun.Application.WebApi.Modules
             /// </summary>
             public string StudentLoan { get; set; }
             /// <summary>
+            /// 贷款回执码状态
+            /// </summary>
+            public string StudentLoanStatus { get; set; }
+            /// <summary>
             /// 家庭成员
             /// </summary>
             public List<StuInfoFreshFamilyEntity> StuInfoFreshFamilyEntities { get; set; }