学生请假功能修改；流程修复 点击不同意时未调用依赖注入方法问题；

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckIndex.js

@@ -64,17 +64,17 @@ var bootstrap = function ($, learun) {
                             }
                         }
                     },
-                    { label: "审核备注", name: "CheckRemark", width: 100, align: "left" },
+                    //{ label: "审核备注", name: "CheckRemark", width: 100, align: "left" },
                     { label: "审核时间", name: "CheckTime", width: 130, align: "left" },
                     {
-                        label: "审核人", name: "CheckUserNo", width: 100, align: "left",
+                        label: "审核人", name: "CheckUserId", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo',
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
                                 key: value,
-                                keyId: 'empno',
+                                keyId: 'f_userid',
                                 callback: function (_data) {
-                                    callback(_data['empname']);
+                                    callback(_data['f_realname']);
                                 }
                             });
                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/Index.js

@@ -110,7 +110,7 @@ var bootstrap = function ($, learun) {
         },
         // 初始化列表
         initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
+            $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/StuLeaveManagement/GetPageList',
                 headData: [
                     {
@@ -128,17 +128,17 @@ var bootstrap = function ($, learun) {
                         }
 
                     },
-                    { label: "审核备注", name: "CheckRemark", width: 100, align: "left" },
+                    //{ label: "审核备注", name: "CheckRemark", width: 100, align: "left" },
                     { label: "审核时间", name: "CheckTime", width: 130, align: "left" },
                     {
-                        label: "审核人", name: "CheckUserNo", width: 100, align: "left",
+                        label: "审核人", name: "CheckUserId", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo',
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
                                 key: value,
-                                keyId: 'empno',
+                                keyId: 'f_userid',
                                 callback: function (_data) {
-                                    callback(_data['empname']);
+                                    callback(_data['f_realname']);
                                 }
                             });
                         }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/StuLeaveManagementMethod.cs

@@ -17,13 +17,10 @@ namespace Learun.Application.WorkFlow
             {
                 stuLeaveManagementIBLL.ChangeStatusByProcessId("2", parameter.processId, parameter.userId);
             }
-            else if (parameter.code == "disagree")
+            else 
             {
                 stuLeaveManagementIBLL.ChangeStatusByProcessId("3", parameter.processId, parameter.userId);
             }
-            else {
-                stuLeaveManagementIBLL.ChangeStatusByProcessId("0", parameter.processId, parameter.userId);
-            }
         }
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Workflow/Learun.Workflow.Engine/NWFEngine.cs

@@ -292,18 +292,42 @@ namespace Learun.Workflow.Engine
         public List<NWFNodeInfo> GetNextNodes(string nodeId, string code, List<NWFLineInfo> lineList, bool overFW = false)
         {
 
-
             List<NWFNodeInfo> nextNodes = new List<NWFNodeInfo>();
             //如果lastNode 不为空，直接执行最后一条线的绑定方法  并终止任务
             List<NWFLineInfo> lineList1 = new List<NWFLineInfo>();
             if (overFW)
             {
-                lineList1.Add(wfScheme.lines.Last());
+                //20221202 liangkun
+                //修改判断最后线段方法，之前直接获取last线段有问题
+                //设计器并非所有情况都会把最后一条线段放在last位置
+                //判断last节点是否是end节点之前的线
+                //先获取所节点
+                var allnodes = wfScheme.nodes;
+                //查找结束节点
+                var endnode = allnodes.Find(m => m.type == "endround");
+                //查到结束节点
+                if (endnode != null)
+                {
+                    //使用结束节点的id到线条集合内查找，查询到to结束节点的线条本身并赋值
+                    //to结束节点的线，即是最后的线条，一般绑定事件都会在此线段上
+                    var endline = wfScheme.lines.Find(m => m.to == endnode.id);
+                    if (endline != null)
+                    {
+                        lineList1.Add(endline);
+                    }
+                    else
+                    {
+                        lineList1.Add(wfScheme.lines.Last());
+                    }
+                }
+                else//未查到结束节点，直接赋值最后的线条
+                {
+                    lineList1.Add(wfScheme.lines.Last());
+                }
             }
             else
             {
                 lineList1 = wfScheme.lines;
-
             }
 
             // 找到与当前节点相连的线条
@@ -359,6 +383,15 @@ namespace Learun.Workflow.Engine
                         }
                     }
                 }
+                //20221202 liangkun 配合以上代码添加结束节点以及线段并返回
+                else
+                {
+                    if (overFW)
+                    {
+                        lineList.Add(line);
+                        nextNodes.Add(nodesMap[line.to]);
+                    }
+                }
             }
             return nextNodes;