From 1eaa4f3b4da27846ba7e0c08e735a9612714043c Mon Sep 17 00:00:00 2001
From: zhichao lei <442149704@qq.com>
Date: Thu, 11 Mar 2021 15:48:46 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=91=E9=9A=85=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LR_NewWorkFlow/Controllers/NWFProcessController.cs      | 2 +-
 .../Areas/LR_NewWorkFlow/Views/NWFProcess/htPrint.cshtml    | 4 ++++
 .../LR_LGManager/LC_hetong/LC_hetongEntity.cs               | 6 ++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs
index 544387f89..851a4b602 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs	
@@ -122,7 +122,7 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers
             var userInfo = new UserEntity();
             if (data != null)
             {
-                userInfo = userIbll.GetEntityByUserId(data.F_CreateUserName);
+                userInfo = userIbll.GetEntityByUserId(data.LC_sqwtr);
             }
             var beginTime = data?.LC_htkssj.ToDate();
             var endTime = data?.LC_htjssj.ToDate();
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/htPrint.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/htPrint.cshtml
index f19e0fd41..e0b0bedc8 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/htPrint.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/htPrint.cshtml	
@@ -55,12 +55,16 @@
 </body>
 </html>
 <script>
+    var aurl = '@ViewBag.StampImg' ;
+    var burl = '@ViewBag.SignImg';
     //盖章图片
     var stampUrl = '/LR_NewWorkFlow/StampInfo/GetImg?keyValue=@ViewBag.StampImg';
     var signUrl = '/LR_SystemModule/Img/GetImg?keyValue=@ViewBag.SignImg';
     $('#signImg').attr('src', signUrl);
     $('#stampImg').attr('src', stampUrl);
 
+    if(!aurl){$('#signImg').hide()}
+    if(!burl){$('#stampImg').hide()}
     var signImg = new Image();
     var stampImg = new Image();
     signImg.src = $('#signImg')[0].src;
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/LC_hetong/LC_hetongEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/LC_hetong/LC_hetongEntity.cs
index 7fccc5a90..f3449c94b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/LC_hetong/LC_hetongEntity.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/LC_hetong/LC_hetongEntity.cs	
@@ -195,6 +195,12 @@ namespace Learun.Application.TwoDevelopment.LR_LGManager
         [Column("LC_BGSYJ")]
         public string LC_bgsyj { get; set; }
         /// <summary>
+        /// LC_sqwtr
+        /// </summary>
+        /// <returns></returns>
+        [Column("LC_SQWTR")]
+        public string LC_sqwtr { get; set; }
+        /// <summary>
         /// OperationTime
         /// </summary>
         /// <returns></returns>