From 9b80d52048ed0f0ba25290368d66f9101bf1a41d Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Tue, 29 Jun 2021 16:43:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E4=B8=8A=E6=8A=A5=E6=95=B0=E6=8D=AE+?= =?UTF-8?q?=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/IndexReport.js | 1 + .../LR_Desktop/QualityReportMain/QualityReportMainService.cs | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/IndexReport.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/IndexReport.js index 00a6ce7cd..90a73daff 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/IndexReport.js +++ b/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) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/QualityReportMain/QualityReportMainService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/QualityReportMain/QualityReportMainService.cs index dfab3369f..d971ccfbd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/QualityReportMain/QualityReportMainService.cs +++ b/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(strSql.ToString(), dp, pagination); }