流程测试修改

Edu.Module.Course/OrderModule2.cs

@@ -140,7 +140,6 @@ namespace Edu.Module.Course
             int index = 0;
             foreach (var item in flowModel.FlowNodeList)
             {
-
                 if (item.FlowAduitList != null && item.FlowAduitList.Count > 0)
                 {
                     string AuditedId = "";//审核人
@@ -206,7 +205,6 @@ namespace Edu.Module.Course
                         SpecialNode = item.FlowAduitList[0].IsSpecNode,
                         Stauts =  Common.Enum.User.WFRrocessStatus.NotAudit,
                         WorkFlowId = Common.Config.BackClassFlowId,
-                         
                     };
                     var backLevanceId = student_BackRelevanceRepository.Insert(backLevance);
                     backLevance.Id = backLevanceId;

Edu.Module.Course/StudentBillModule.cs

@@ -582,6 +582,7 @@ namespace Edu.Module.Course
                 if (auditRelevance != null)
                 {
                     List<int> empList = new List<int>();
+                    //添加角色对应的人员
                     if (!string.IsNullOrEmpty(auditRelevance.PostIds))
                     {
                         var postList = Common.ConvertHelper.StringToList(auditRelevance.PostIds);
@@ -628,8 +629,18 @@ namespace Edu.Module.Course
                             }
                         }
                     }
-                    //以前的存入的数据
-                    //empList = Common.ConvertHelper.StringToList(auditRelevance.ToAuditId);
+                    //添加指定用户
+                    if (!string.IsNullOrEmpty(auditRelevance.UserIds))
+                    {
+                        var userList = Common.ConvertHelper.StringToList(auditRelevance.UserIds);
+                        foreach (var item in userList)
+                        {
+                            if (item > 0)
+                            {
+                                empList.Add(item);
+                            }
+                        }
+                    }
                     InsertBatcheAuditRecord(empList, backModel.BackId, auditRelevance);
                 }
             }

Edu.Module.System/BasicFlowModule.cs

@@ -69,18 +69,20 @@ namespace Edu.Module.System
             bool flag = false;
             string logContent = "";
             RB_Flow_ViewModel oldModel = null;
+            oldModel = GetFlowModule(extModel.FlowId);
+            extModel.FlowId = oldModel?.FlowId ?? 0;
             if (extModel.FlowId > 0)
             {
-                oldModel = GetFlowModule(extModel.FlowId);
+               
                 Dictionary<string, object> fileds = new Dictionary<string, object>()
                 {
                     {nameof(RB_Flow_ViewModel.FlowName),extModel.FlowName },
                     {nameof(RB_Flow_ViewModel.UpdateBy),extModel.UpdateBy },
                     {nameof(RB_Flow_ViewModel.UpdateTime),extModel.UpdateTime },
                 };
-                if (oldModel.FlowName != extModel.FlowName)
+                if ((oldModel?.FlowName??"") != extModel.FlowName)
                 {
-                    logContent += string.Format(",流程名称由【{0}】修改为【{1}】", oldModel.FlowName, extModel.FlowName);
+                    logContent += string.Format(",流程名称由【{0}】修改为【{1}】", (oldModel?.FlowName ?? ""), extModel.FlowName);
                 }
                 flag = flowRepository.Update(fileds, new WhereHelper(nameof(RB_Flow_ViewModel.FlowId), extModel.FlowId));
             }

Edu.WebApi/Controllers/Course/StuController.cs

@@ -87,6 +87,7 @@ namespace Edu.WebApi.Controllers.Course
                     item.ApplyReason,
                     item.OrderId,
                     AuditStatusName=item.AuditStatus.ToName(),
+                    item.SpecialNode
                 });
             }
             pageModel.Count = rowsCount;
@@ -98,6 +99,7 @@ namespace Edu.WebApi.Controllers.Course
         /// 获取退款单据审核信息
         /// </summary>
         /// <returns></returns>
+        [HttpPost]
         public ApiResult SetBackBillAduit()
         {
             //退课单据号