From 72e4a4d81cb1b9776ffb7287e0c5ed67592eda8b Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 11 十二月 2023 15:20:28 +0800
Subject: [PATCH] 试用期工资计算
---
zhengcaioa/Services/WfHistoryService.cs | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/zhengcaioa/Services/WfHistoryService.cs b/zhengcaioa/Services/WfHistoryService.cs
index a19cbc3..fe2dc40 100644
--- a/zhengcaioa/Services/WfHistoryService.cs
+++ b/zhengcaioa/Services/WfHistoryService.cs
@@ -350,6 +350,8 @@
join a in _context.WfHistories
on k.Id equals a.RunProcessId
+ into asssss
+ from aaa in asssss.DefaultIfEmpty()
join e in listCode.Where(x => x.CodeTable == "wf_run_process" && x.CodeField == "shenpi_status")
on k.ShenpiStatus equals e.CodeSn
@@ -396,7 +398,7 @@
Content = k.Content,
ShenpiStatusName = eee.Comments,
- Deelurl = a.Deelurl,
+ Deelurl = aaa.Deelurl,
Creater = k.Creater,
Createtime = k.Createtime,
Step = k.Step,
--
Gitblit v1.9.1