流程bug

EquipMgr/Tnb.EquipMgr/EqpRepairOutApplyService.cs

@@ -111,6 +111,7 @@ namespace Tnb.EquipMgr
                         formData = new JObject()
                         {
                             {"id",id},
+                            {"flowId",flowId},
                             {"repair_apply_id",input.repair_apply_id},
                             {"equip_id",input.equip_id},
                             {"create_id",_userManager.UserId},
@@ -138,6 +139,7 @@ namespace Tnb.EquipMgr
                             formData = new JObject()
                             {
                                 {"id",id},
+                                {"flowId",flowId},
                                 {"repair_apply_id",input.repair_apply_id},
                                 {"equip_id",input.equip_id},
                                 {"create_id",_userManager.UserId},

workflow/Tnb.WorkFlow/Manager/FlowTaskOtherUtil.cs

@@ -418,6 +418,13 @@ public class FlowTaskOtherUtil
                     mapRule = GetMapRule(approversPro.assignList, flowTaskParamter.flowTaskNodeEntity.NodeCode);
                 }
                 var data =await _runService.GetFlowFormDataDetails(thisFormId, flowTaskParamter.flowTaskEntity.Id);
+                if (!data.ContainsKey("flowId"))//modifyby zhoukeda 20230704
+                {
+                    if (((Dictionary<string, object>)flowTaskParamter.formData).TryGetValue("flowId",out var value))
+                    {
+                        data.Add("flowId",value);
+                    }
+                }
                 var nextFormData = await _runService.SaveDataToDataByFId(thisFormId, nextFormId, mapRule, data);
                 nextNodeData[item.NodeCode] = nextFormData;
             }

workflow/Tnb.WorkFlow/Repository/FlowTaskRepository.cs

@@ -1389,7 +1389,8 @@ public class FlowTaskRepository : IFlowTaskRepository, ITransient
             status = a.Status,
             userName = SqlFunc.Subqueryable<UserEntity>().Where(u => u.Id == a.HandleId).Select(u => SqlFunc.MergeString(u.RealName, "/", u.Account)),
             operatorId = SqlFunc.Subqueryable<UserEntity>().Where(u => u.Id == a.OperatorId).Select(u => SqlFunc.MergeString(u.RealName, "/", u.Account)),
-            creatorTime = SqlFunc.IsNullOrEmpty(b.CreatorTime) ? a.HandleTime : b.CreatorTime,
+            // creatorTime = SqlFunc.IsNullOrEmpty(b.CreatorTime) ? a.HandleTime : b.CreatorTime,
+            creatorTime = b.CreatorTime==null ? a.HandleTime : b.CreatorTime, //modifyby zhoukeda 20230704
             fileList = a.FileList
         }).ToListAsync();
     }