From e220e6561aba1e0962a92dbe458d7acc3f6ae766 Mon Sep 17 00:00:00 2001
From: liangkun <liangkun7173@hotmail.com>
Date: Wed, 7 Apr 2021 15:04:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=99=E5=B8=88=E7=AE=A1=E7=90=86=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=A2=9E=E5=8A=A0=E8=81=8C=E5=B7=A5=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EducationalAdministration/Views/EmpInfo/Index.cshtml     | 4 ++++
 .../Areas/EducationalAdministration/Views/EmpInfo/Index.js   | 2 ++
 .../Views/Utility/ListContentIndex.cshtml                    | 2 +-
 .../EducationalAdministration/EmpInfo/EmpInfoService.cs      | 5 +++++
 4 files changed, 12 insertions(+), 1 deletion(-)

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 @@
                                     <div class="lr-form-item-title">是否审核</div>
                                     <div id="CheckMark"></div>
                                 </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">职工状态</div>
+                                    <div id="IsInActiveStatus"></div>
+                                </div>
                             </div>
                         </div>
                     </div>
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 @@
             <div class="listDotT" id="F_FullHead"></div>
             <div class="listDotTime">
                 <span>发布时间:<span id="F_CreateDate"></span></span>
-                <span>发布:<span id="F_CreateUserName"></span></span>
+                <span>信息来源:<span id="F_CreateUserName"></span></span>
                 <span>公告类别:<span id="F_Category"></span></span>
             </div>
             <div class="listDotBox" id="F_NewsContent">
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<EmpInfoEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)