From dfbf3c09a8259db72fab4d411756b89aee937153 Mon Sep 17 00:00:00 2001 From: edy Date: Thu, 2 Sep 2021 10:40:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A8=E9=87=8F=E7=9B=AE?= =?UTF-8?q?=E6=A0=87=E7=AE=A1=E7=90=86=E4=BD=93=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/FillinFromController.cs | 1 - .../Views/FillinFrom/Index.cshtml | 3 +-- .../Views/FillinFrom/Index.js | 1 - .../FillinFrom/FillinFromService.cs | 14 +++----------- 4 files changed, 4 insertions(+), 15 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/FillinFromController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/FillinFromController.cs index 74f3f633a..f56feaac5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/FillinFromController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/FillinFromController.cs @@ -32,7 +32,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers public ActionResult Index() { var logininfo = LoginUserInfo.Get(); - ViewBag.isSystem = logininfo.isSystem; ViewBag.departmentId = ""; var Model = departmentIBLL.GetEntity(logininfo.companyId, logininfo.departmentId); if (Model.F_Manager == logininfo.realName) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Index.cshtml index 5a5a0eeba..9d4cd2414 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Index.cshtml @@ -3,8 +3,7 @@ Layout = "~/Views/Shared/_Index.cshtml"; }
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Index.js index 863b19adf..fec50d28e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Index.js @@ -305,7 +305,6 @@ var bootstrap = function ($, learun) { }, search: function (param) { param = param || {}; - param.isSystem = isSystem; param.departmentId = departmentId; $('#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 662cbc50b..d3b5a3cff 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 @@ -78,18 +78,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("IsFlag", queryParam["IsFlag"].ToString(), DbType.String); strSql.Append(" AND t.IsFlag = @IsFlag "); } - if (queryParam["isSystem"].ToBool() == false) + if (!queryParam["departmentId"].IsEmpty()) { - if (!queryParam["departmentId"].IsEmpty()) - { - dp.Add("FillingDept", queryParam["departmentId"].ToString(), DbType.String); - strSql.Append(" AND t.FillingDept = @FillingDept "); - } - else - { - dp.Add("FillingDept", "undefined11", DbType.String); - strSql.Append(" AND t.FillingDept = @FillingDept "); - } + dp.Add("FillingDept", queryParam["departmentId"].ToString(), DbType.String); + strSql.Append(" AND t.FillingDept = @FillingDept "); } //sql条件 if (!queryParam["SqlParameter"].IsEmpty())