diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/scripts/lrmuiex.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/scripts/lrmuiex.js index 341111d94..6b9465af2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/scripts/lrmuiex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/scripts/lrmuiex.js @@ -803,11 +803,10 @@ code: op.code, callback: function (data) { if (op.placeHolders != '') { - console.log(data); var obj={}; obj[op.ivalue] = op.placeHolders; obj[op.itext] = op.placeHolders; - data.splice(0, 0, obj); + //data.splice(0, 0, obj); } $this.lrpickerSetData(data); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js index 05123acdd..74549be76 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js @@ -655,6 +655,7 @@ var bootstrap = function ($, learun) { ], mainId: 'EmpId', isPage: true, + rows:100, isMultiselect: true }); page.search(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs index cfa5dfe9d..d6d5b36bd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs @@ -127,6 +127,10 @@ namespace Learun.Application.Web.Controllers return Redirect("NoLogin"); } var userinfo = LoginUserInfo.Get(); + if (userinfo.Description == "学生") + { + return Redirect("NoLogin"); + } var flowType = dataItemIBLL.GetDetailList("FlowSort", ""); var flowList = wfSchemeIBLL.GetWfSchemeStart().ToList(); var allCount = 0; @@ -937,6 +941,10 @@ namespace Learun.Application.Web.Controllers } //登录用户 var userInfo = LoginUserInfo.Get(); + if (userInfo.Description == "学生") + { + return Redirect("NoLogin"); + } ViewBag.UserId = userInfo.userId; //桌面管理表、卡片块排序管理表增加默认数据 sSO_Drag_DesktopManageIBLL.AddDefaultData(userInfo.userId, "one"); @@ -1271,6 +1279,10 @@ namespace Learun.Application.Web.Controllers } //登录用户 var userInfo = LoginUserInfo.Get(); + if (userInfo.Description == "学生") + { + return Redirect("NoLogin"); + } ViewBag.UserId = userInfo.userId; //桌面管理表、卡片块排序管理表增加默认数据 sSO_Drag_DesktopManageIBLL.AddDefaultData(userInfo.userId, "two"); @@ -1609,6 +1621,10 @@ namespace Learun.Application.Web.Controllers } //登录用户 var userInfo = LoginUserInfo.Get(); + if (userInfo.Description == "学生") + { + return Redirect("NoLogin"); + } ViewBag.UserId = userInfo.userId; //校园总览 //专业