Merge branch '长阳分支中职' of 123.57.209.16:bjquanjiang/DigitalScholl into 长阳分支中职

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>

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);