From 4ccd32e58292663e384780c8cd12dd7e6dfe6522 Mon Sep 17 00:00:00 2001
From: zhangli <1109134334@qq.com>
Date: Mon, 28 Jun 2021 10:45:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=8A=E6=8A=A5=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E5=88=97=E8=A1=A8=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Areas/LR_Desktop/Views/QualityReport/Index.js          | 2 +-
 .../FillinFrom/FillinFromService.cs                        | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/Index.js
index 425a80019..3a2d19a65 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/Index.js	
@@ -142,7 +142,7 @@ var bootstrap = function ($, learun) {
         search: function (param) {
             param = param || {};
             param.SqlParameter = ' AND (FillingPeople is not null and len(FillingPeople)>0) and (Formula is not null and len(Formula)>0)';
-            
+            param.FillingPeople = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/FillinFrom/FillinFromService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/FillinFrom/FillinFromService.cs
index 6e0bcbd56..04befb2db 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/FillinFrom/FillinFromService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/FillinFrom/FillinFromService.cs	
@@ -70,8 +70,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
                 if (!queryParam["FillingPeople"].IsEmpty())
                 {
-                    dp.Add("FillingPeople", queryParam["FillingPeople"].ToString(), DbType.String);
-                    strSql.Append(" AND t.FillingPeople = @FillingPeople ");
+                    if (queryParam["FillingPeople"].ToString() != "System")
+                    {
+                        dp.Add("FillingPeople", queryParam["FillingPeople"].ToString(), DbType.String);
+                        strSql.Append(" AND t.FillingPeople = @FillingPeople ");
+                    }
                 }
                 if (!queryParam["IsFlag"].IsEmpty())
                 {