Browse Source

fixed: 未回访的数据,新流程明细mapper异常

xf 4 months ago
parent
commit
c2094bfcb4

+ 3 - 0
src/Hotline.Application/Mappers/OrderMapperConfigs.cs

@@ -258,8 +258,11 @@ public class OrderMapperConfigs : IRegister
             ;
 
         config.ForType<OrderVisitDetail, OrderFlowVisitDetail>()
+            .IgnoreIf((s, d) => s.OrgProcessingResults == null, d => d.OrgProcessingResults)
             .Map(d => d.OrgProcessingResults, s => s.OrgProcessingResults.Value)
+            .IgnoreIf((s, d) => s.OrgNoSatisfiedReason == null, d => d.OrgNoSatisfiedReason)
             .Map(d => d.OrgNoSatisfiedReason, s => s.OrgNoSatisfiedReason.Select(d => d.Value))
+            .IgnoreIf((s, d) => s.OrgHandledAttitude == null, d => d.OrgHandledAttitude)
             .Map(d => d.OrgHandledAttitude, s => s.OrgHandledAttitude.Value)
             ;
 

+ 1 - 2
src/Hotline.Application/Orders/OrderApplication.cs

@@ -3769,8 +3769,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
         //    (step.FlowAssignType == EFlowAssignType.Role && !string.IsNullOrEmpty(step.RoleId) && _sessionContextProvider.SessionContext.Roles.Contains(step.RoleId)))).Any() ||
         //    (string.IsNullOrEmpty(d.WorkflowId) && (string.IsNullOrEmpty(d.SignerId) || d.SignerId == _sessionContextProvider.SessionContext.RequiredUserId))
         //);
-
-
+        
         return query
             // 交办件:已派单其他节点的工单,该选项卡下工单若办结就不显示
             .WhereIF(dto.TypeCode.HasValue == true && dto.TypeCode == 1, d => /*d.ProcessType == EProcessType.Jiaoban &&*/ d.Status < EOrderStatus.Filed)