From c60a7d7b29faba465969555e2a9c69acb8510f90 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 25 二月 2022 09:11:41 +0800
Subject: [PATCH] 如果客户资料中有“*”的内容,生产文书时自动填上,质疑单位默认填写客户名称,可修改

---
 zhengcaioa/Services/WfNeeddeelService.cs |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/zhengcaioa/Services/WfNeeddeelService.cs b/zhengcaioa/Services/WfNeeddeelService.cs
index 7e51ce9..30f0f34 100644
--- a/zhengcaioa/Services/WfNeeddeelService.cs
+++ b/zhengcaioa/Services/WfNeeddeelService.cs
@@ -143,6 +143,8 @@
 
                          join d in _context.WfApplytypes
                        on k.Applytiye equals d.Applyno
+                         into dsssss
+                         from ddd in dsssss.DefaultIfEmpty()
 
                          join b in _context.PltUsers 
                         on k.Creater equals b.Id
@@ -185,7 +187,7 @@
                              Applyno = k.Applyno,
                              CreaterName = b.UserName,
                              DeptName = c.DeptName,
-                             Applytiye = d.Applytiye,
+                             Applytiye = ddd.Applytiye,
                              Content = k.Content,
                              ShenpiStatusName = eee.Comments,
                              Resivetime = a.Resivetime,
@@ -202,7 +204,7 @@
                              Modifytime = a.Modifytime,
 
                          }
-                 ).OrderBy(x => x.Sort).ThenByDescending(x => x.Resivetime).ToList();
+                 ).OrderByDescending(x=>x.Applyno).ThenBy(x => x.Sort).ThenByDescending(x => x.Resivetime).ToList();
 
 
 

--
Gitblit v1.9.1