From cde1a78f3da4c8248d67085a50ba0fe7cc43a2f3 Mon Sep 17 00:00:00 2001 From: dyy <18335927079@163.com> Date: Thu, 10 Jun 2021 14:15:38 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E8=B4=A6=E5=8F=B7=EF=BC=9A=E5=A2=9E=E5=8A=A0=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E3=80=81=E8=A7=92=E8=89=B2=E5=88=97=EF=BC=9B=E6=95=99?= =?UTF-8?q?=E5=B8=88=E6=B3=A8=E5=86=8C=E4=BC=98=E5=8C=96=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/EmpInfoEnternalController.cs | 1 + .../Views/EmpInfoEnternal/FormAdd.cshtml | 6 +++--- .../Views/LoginUserBind/BindAccountIndex.js | 18 ++++++++++++++++++ .../LoginUserBind/LoginUserBindEntity.cs | 4 ++++ .../LoginUserBind/LoginUserBindService.cs | 3 ++- 5 files changed, 28 insertions(+), 4 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/EmpInfoEnternalController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/EmpInfoEnternalController.cs index 43c1b5f2b..97c57484a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/EmpInfoEnternalController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/EmpInfoEnternalController.cs @@ -19,6 +19,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers AnnexesFileIBLL annexesFileIBLL = new AnnexesFileBLL(); public ActionResult FormAdd() { + ViewBag.EmpNo = CommonHelper.CreateNo(); return View(); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfoEnternal/FormAdd.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfoEnternal/FormAdd.cshtml index f21e7877b..af034475d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfoEnternal/FormAdd.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfoEnternal/FormAdd.cshtml @@ -23,7 +23,7 @@
- 数字化智慧校园 | 教职工信息注册 + 数字化智慧校园 | 教职工信息注册
@@ -36,7 +36,7 @@
* 职工编号 - +
@@ -262,7 +262,7 @@ var companys = $.parseJSON(msg).data.data; var str = ''; $.each(companys, function (i, item) { - str += '' + str += '' }) $("#F_DepartmentId").html(str); }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LoginUserBind/BindAccountIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LoginUserBind/BindAccountIndex.js index 6b60c86d6..39cf16c0c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LoginUserBind/BindAccountIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LoginUserBind/BindAccountIndex.js @@ -39,6 +39,24 @@ var bootstrap = function ($, learun) { url: top.$.rootUrl + '/EducationalAdministration/LoginUserBind/GetPageList', headData: [ { label: "绑定账号", name: "BindUserAccount", width: 150, align: "left" }, + { label: "名称", name: "F_RealName", width: 150, align: "left" }, + { + label: '角色', name: 'F_UserId', width: 250, align: 'left', + formatterAsync: function (callback, value, row) { + learun.httpAsyncGet(top.$.rootUrl + '/LR_OrganizationModule/User/GetRoleList?objectId=' + value, function (res) { + if (res.code == learun.httpCode.success) { + var str = ""; + for (var i = 0; i < res.data.roleInfoList.length; i++) { + str += res.data.roleInfoList[i].F_FullName; + if (i != res.data.roleInfoList.length - 1) { + str += ','; + } + } + callback(str); + } + }); + } + }, ], mainId: 'Id', isPage: true, diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LoginUserBind/LoginUserBindEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LoginUserBind/LoginUserBindEntity.cs index 8a44c3b9b..a96254ee0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LoginUserBind/LoginUserBindEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LoginUserBind/LoginUserBindEntity.cs @@ -71,6 +71,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration #region 扩展字段 [NotMapped] public string BindUserPasswordTemp { get; set; } + [NotMapped] + public string F_UserId { get; set; } + [NotMapped] + public string F_RealName { get; set; } #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LoginUserBind/LoginUserBindService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LoginUserBind/LoginUserBindService.cs index eb3f74b42..331eaeb7e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LoginUserBind/LoginUserBindService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LoginUserBind/LoginUserBindService.cs @@ -30,8 +30,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration try { var strSql = new StringBuilder(); - strSql.Append("SELECT t.* "); + strSql.Append("SELECT t.*,u.F_UserId,u.F_RealName "); strSql.Append(" FROM LoginUserBind t "); + strSql.Append(" left join LR_Base_User u on t.BindUserAccount=u.F_Account "); strSql.Append(" WHERE 1=1 "); var queryParam = queryJson.ToJObject(); // 虚拟参数