From bc0d430f3308eee4def127a90c0558e580f294da Mon Sep 17 00:00:00 2001
From: zhichao lei <442149704@qq.com>
Date: Mon, 4 Jan 2021 16:10:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=8A=82=E7=82=B9=E7=BA=BF?=
 =?UTF-8?q?=20=E7=9A=84=E5=88=A4=E6=96=AD=E6=96=B9=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Sys_ReceiveFileController.cs  |   2 +-
 .../Views/Sys_ReceiveDocument/PrintView.js    |  11 +-
 .../Views/Sys_ReceiveFile/Form.js             |   3 +
 .../XmlConfig/database.config                 |   8 +-
 .../Sys_ReceiveFile/Sys_ReceiveFileService.cs |   3 +-
 .../Learun.Workflow.Engine/NWFEngine.cs       | 103 ++++++++----------
 6 files changed, 64 insertions(+), 66 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_ReceiveFileController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_ReceiveFileController.cs
index 32bac3040..490ed7d09 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_ReceiveFileController.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_ReceiveFileController.cs	
@@ -262,7 +262,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         /// 校长批示
         /// </summary>
         /// <returns></returns>
-        [HttpGet]
+        [HttpPost]
         [AjaxOnly]
         public ActionResult XiaoZhangP(string strEntity)
         {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/PrintView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/PrintView.js
index 5684ecbba..24e4c8dd1 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/PrintView.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/PrintView.js	
@@ -20,7 +20,14 @@ var bootstrap = function ($, learun) {
                     var data = JSON.parse(data).data;
                     var entityItem = data.entityItem;
                     console.log(data);
-                    $('#RReceiveUnit').html(data.entity.RReceiveUnit);
+                    learun.clientdata.getAsync('department', {
+                        key: data.entity.RReceiveUnit,
+                        callback: function (_data) {
+                            console.log(_data);
+                            $('#RReceiveUnit').html(_data.name);
+                            
+                        }
+                    }); 
                     $('#swz').html(data.entity.swz);
                     $('#RReceiveTime').html(data.entity.RReceiveTime.substr(0,10));
                     $('#RSourceUnit').html(data.entity.RSourceUnit);
@@ -55,7 +62,7 @@ var bootstrap = function ($, learun) {
                                 callback: function (_data) {
 
                                     text += '<div class="tableTxt1">' +
-                                        item.SpecifyReceiver +
+                                        (item.SpecifyReceiver == '' ? '已阅' : item.SpecifyReceiver) +
                                         '</div> <div class="tableTxt2"> '+_data.name+' '+(item.ReadTime || '').substr(0,10)+'</div>';
                                 }
                             }); 
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 69f163320..e51ecc630 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	
@@ -56,6 +56,9 @@ var bootstrap = function ($, learun) {
         if (!$('body').lrValidform()) {
             return false;
         }
+        if ($('.lr-radio').find('input:radio:checked').length==0) {
+            $('.lr-radio').find('input')[0].checked = true;
+        }
         var postData = {
             strEntity: JSON.stringify($('body').lrGetFormData())
         };
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 489b3b61f..5d293d24b 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_ReceiveFile/Sys_ReceiveFileService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileService.cs
index 5ed5c2d61..c45480df4 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileService.cs	
@@ -144,6 +144,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         {
             try
             {
+                var userInfo = LoginUserInfo.Get();
                 var list = this.BaseRepository().FindList<Sys_ReceiveFileEntity>(a => a.SenderId == userId && a.RStatus==0);
                 return list;
             }
@@ -521,7 +522,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             var PeopleInTheSameDepartment = this.BaseRepository()
                 .FindList<UserEntity>(a => a.F_DepartmentId == loginUser.departmentId);
             //从同一部门的人中找出主任
-            var roleEntity = this.BaseRepository().FindEntity<RoleEntity>(a => a.F_FullName == "公文接收主任");
+            var roleEntity = this.BaseRepository().FindEntity<RoleEntity>(a => a.F_FullName == "中层干部正职");
             var allZhuRen = new List<string>();
             if (null != roleEntity)
             {
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 612e38dee..0ca477209 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	
@@ -292,86 +292,73 @@ namespace Learun.Workflow.Engine
         public List<NWFNodeInfo> GetNextNodes(string nodeId, string code, List<NWFLineInfo> lineList, bool overFW = false)
         {
 
-
             List<NWFNodeInfo> nextNodes = new List<NWFNodeInfo>();
-            // 找到与当前节点相连的线条
-            NWFLineInfo line = null;
             //如果lastNode 不为空，直接执行最后一条线的绑定方法  并终止任务
+            List<NWFLineInfo> lineList1=new List<NWFLineInfo>();
             if (overFW)
             {
-                line = wfScheme.lines.Last();
+                lineList1.Add(wfScheme.lines.Last()); 
             }
             else
             {
-                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();
-                }
-            }
-
+                lineList1 = wfScheme.lines;
 
-            bool isOk = false;
-            if (string.IsNullOrEmpty(line.strategy) || line.strategy == "1")
-            {
-                isOk = true;
             }
-            else
+
+            // 找到与当前节点相连的线条
+            foreach (var line in lineList1)
             {
-                var codeList = line.agreeList.Split(',');
-                foreach (string _code in codeList)
+                if (line.from == nodeId)
                 {
-                    if (_code == code)
+                    bool isOk = false;
+                    if (string.IsNullOrEmpty(line.strategy) || line.strategy == "1")
                     {
                         isOk = true;
-                        break;
-                    }
-                }
-            }
-            if (isOk)
-            {
-                if (nodesMap.ContainsKey(line.to))
-                {
-                    //如果lastNode 不为空，直接执行最后一条线的绑定方法  并终止任务
-                    if (overFW)
-                    {
-                        nextNodes.Add(endNode);
                     }
                     else
                     {
-                        nextNodes.Add(nodesMap[line.to]);
-                    }
-
-                    switch (line.operationType)
-                    {// 绑定的操作类型
-                        case "sql":          // sql 语句
-                            if (!string.IsNullOrEmpty(line.dbId) && !string.IsNullOrEmpty(line.strSql))
-                            {
-                                lineList.Add(line);
-                            }
-                            break;
-                        case "interface":    // interface 接口
-                            if (!string.IsNullOrEmpty(line.strInterface))
-                            {
-                                lineList.Add(line);
-                            }
-                            break;
-                        case "ioc":          // 依赖注入
-                            if (!string.IsNullOrEmpty(line.iocName))
+                        var codeList = line.agreeList.Split(',');
+                        foreach (string _code in codeList)
+                        {
+                            if (_code == code)
                             {
-                                lineList.Add(line);
+                                isOk = true;
+                                break;
                             }
-                            break;
+                        }
                     }
+                    if (isOk)
+                    {
+                        if (nodesMap.ContainsKey(line.to))
+                        {
+                            nextNodes.Add(nodesMap[line.to]);
 
+                            switch (line.operationType)
+                            {// 绑定的操作类型
+                                case "sql":          // sql 语句
+                                    if (!string.IsNullOrEmpty(line.dbId) && !string.IsNullOrEmpty(line.strSql))
+                                    {
+                                        lineList.Add(line);
+                                    }
+                                    break;
+                                case "interface":    // interface 接口
+                                    if (!string.IsNullOrEmpty(line.strInterface))
+                                    {
+                                        lineList.Add(line);
+                                    }
+                                    break;
+                                case "ioc":          // 依赖注入
+                                    if (!string.IsNullOrEmpty(line.iocName))
+                                    {
+                                        lineList.Add(line);
+                                    }
+                                    break;
+                            }
+
+                        }
+                    }
                 }
             }
-
             return nextNodes;
 
         }