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 36ecf66d1..bae626037 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
@@ -23,9 +23,9 @@
@*
*@
+ 系部
+
+ *@
+
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 7da5f5dd1..f7f90d738 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
@@ -59,6 +59,9 @@ var bootstrap = function ($, learun) {
$('#GenderNo').lrDataItemSelect({ code: 'usersexbit' });
//是否审核
$('#CheckMark').lrDataItemSelect({ code: 'YesOrNoInt' });
+ //子女是否14周岁以下
+ $('#IsChildren').lrDataItemSelect({ code: 'YesOrNoInt' });
+
//学位
$('#DegreeNo').lrDataSourceSelect({ code: 'BCdDegree', value: 'degreeno', text: 'degreename' });
//职称
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 f0ab1fb6b..b487a58eb 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,15 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
dp.Add("CheckMark", queryParam["CheckMark"].ToString(), DbType.String);
strSql.Append(" AND t.CheckMark = @CheckMark ");
}
+ if (!queryParam["IsChildren"].IsEmpty())//子女是否14周岁以下
+ {
+ if (queryParam["IsChildren"].ToString() == "1")
+ {
+
+ strSql.Append(" AND t.empid in (select empid from PM_FamilySituation where DATEDIFF(YEAR, birthday, getdate())<14) ");
+ }
+ }
+
return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination);
}
catch (Exception ex)