From 2a014d867d74ea4c05985e9bfda6e4ffc32e6500 Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Wed, 19 Jul 2023 18:00:28 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E6=95=99?= =?UTF-8?q?=E5=AD=A6=E4=B8=9A=E5=8A=A1=E6=A1=A3=E6=A1=88=EF=BC=9A=E4=BC=98?= =?UTF-8?q?=E5=8C=96=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/TeacherServiceInfo/Index.js | 9 ++++++--- .../TeacherServiceInfo/TeacherServiceInfoService.cs | 5 +++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeacherServiceInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeacherServiceInfo/Index.js index c39007c3b..63a4641f3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeacherServiceInfo/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeacherServiceInfo/Index.js @@ -102,10 +102,12 @@ var bootstrap = function ($, learun) { { label: "创建用户", name: "CreateUser", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('user', { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser', key: value, + keyId: 'f_userid', callback: function (_data) { - callback(_data.name); + callback(_data['f_realname']); } }); } @@ -117,7 +119,7 @@ var bootstrap = function ($, learun) { } }, { - label: "附件", name: "Path", width: 100, align: "left", formatter: function (cellvalue) { + label: "档案", name: "Path", width: 100, align: "left", formatter: function (cellvalue) { return !!cellvalue ? "已上传" : "未上传"; } }, @@ -132,6 +134,7 @@ var bootstrap = function ($, learun) { }, search: function (param) { param = param || {}; + param.CreateUser = 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/TeacherServiceInfo/TeacherServiceInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeacherServiceInfo/TeacherServiceInfoService.cs index 215f065d5..dd9c567a1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeacherServiceInfo/TeacherServiceInfoService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeacherServiceInfo/TeacherServiceInfoService.cs @@ -53,6 +53,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("ServiceType", queryParam["ServiceType"].ToString(), DbType.String); strSql.Append(" AND t.ServiceType = @ServiceType "); } + if (!queryParam["CreateUser"].IsEmpty()) + { + dp.Add("CreateUser", queryParam["CreateUser"].ToString(), DbType.String); + strSql.Append(" AND t.CreateUser = @CreateUser "); + } return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); } catch (Exception ex)