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())
                 {