diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml
index f8c885a1e..3b9d93497 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml
@@ -58,6 +58,10 @@
是否审核
+
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 581242ffc..0724f1a8f 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
@@ -72,6 +72,8 @@ var bootstrap = function ($, learun) {
url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTreeNoCheck',
// 访问数据接口参数
});
+ //职工状态
+ $('#IsInActiveStatus').lrDataItemSelect({ code: 'JobStatus' });
// 刷新
$('#lr_refresh').on('click', function () {
location.reload();
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Utility/ListContentIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Utility/ListContentIndex.cshtml
index 4581f7574..a13f95220 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Utility/ListContentIndex.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Utility/ListContentIndex.cshtml
@@ -20,7 +20,7 @@
发布时间:
- 发布:
+ 信息来源:
公告类别:
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs
index 13ad106bc..0e55c710c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs
@@ -127,6 +127,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
dp.Add("CheckMark", queryParam["CheckMark"].ToString(), DbType.String);
strSql.Append(" AND t.CheckMark = @CheckMark ");
}
+ if (!queryParam["IsInActiveStatus"].IsEmpty())//职工状态
+ {
+ dp.Add("IsInActiveStatus", queryParam["IsInActiveStatus"].ToString(), DbType.String);
+ strSql.Append(" AND t.IsInActiveStatus = @IsInActiveStatus ");
+ }
return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination);
}
catch (Exception ex)