Merge branch '金隅分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 金隅分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/IndexReport.js

@@ -174,6 +174,7 @@ var bootstrap = function ($, learun) {
         search: function (param) {
             param = param || {};
             param.FillInFromId = FillInFromId;
+            param.CreateUserId = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/QualityReportMain/QualityReportMainService.cs

@@ -41,6 +41,10 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop
                 {
                     strSql.Append($" AND a.FillInFromId='{queryParam["FillInFromId"].ToString()}' ");
                 }
+                if (!queryParam["CreateUserId"].IsEmpty() && queryParam["CreateUserId"].ToString() != "System")
+                {
+                    strSql.Append($" AND a.CreateUserId='{queryParam["CreateUserId"].ToString()}' ");
+                }
 
                 return this.BaseRepository("CollegeMIS").FindList<QualityReportMainEntity>(strSql.ToString(), dp, pagination);
             }