From 57fc3a6877edc7e92299cb00b65f226c5319b18d Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Mon, 7 Nov 2022 12:01:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E7=9B=8A=E6=80=A7=E5=B2=97=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/WelfarePosition/Index.cshtml                       | 4 ++++
 .../WelfarePosition/WelfarePositionService.cs                | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WelfarePosition/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WelfarePosition/Index.cshtml
index 13fffa9c6..9b3054174 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WelfarePosition/Index.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WelfarePosition/Index.cshtml	
@@ -22,6 +22,10 @@
                                     <div class="lr-form-item-title">姓名</div>
                                     <input id="EmpName" type="text" class="form-control" />
                                 </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">人员类别</div>
+                                    <input id="PeopleType" type="text" class="form-control" />
+                                </div>
                             </div>
                         </div>
                     </div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WelfarePosition/WelfarePositionService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WelfarePosition/WelfarePositionService.cs
index 4f015f13d..5cc4bb26c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WelfarePosition/WelfarePositionService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WelfarePosition/WelfarePositionService.cs	
@@ -74,6 +74,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("EmpName", "%" + queryParam["EmpName"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.EmpName like @EmpName ");
                 }
+                if (!queryParam["PeopleType"].IsEmpty())
+                {
+                    dp.Add("PeopleType", "%" + queryParam["PeopleType"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.PeopleType like @PeopleType ");
+                }
                 if (!queryParam["IssueMonth"].IsEmpty())
                 {
                     dp.Add("IssueMonth", queryParam["IssueMonth"].ToString(), DbType.String);