搜索栏调整：打卡管理->用户管理

1.添加姓名为搜索属性，2。搜索顺序从左到右：姓名、省份证号、状态、企业名称

happy-job-base-system/src/main/webapp/webpage/modules/wsstaff/wsStaffList.jsp

@@ -21,21 +21,25 @@
 	<div id="search-collapse" class="collapse">
 		<div class="accordion-inner">
 			<form:form id="searchForm" modelAttribute="wsStaff" class="form form-horizontal well clearfix">
-				<div class="col-xs-6 col-sm-3 col-md-3">
+				<div class="col-xs-12 col-sm-4 col-md-2">
+					<label class="label-item single-overflow pull-left" title="姓名">姓名：</label>
+					<form:input path="userName" htmlEscape="false" maxlength="15"  class=" form-control input-sm"/>
+				</div>
+				<div class="col-xs-12 col-sm-4 col-md-2">
+					<label class="label-item single-overflow pull-left" title="身份证号：">身份证号：</label>
+					<form:input path="idcardNumber" htmlEscape="false" maxlength="100"  class=" form-control input-sm"/>
+				</div>
+				<div class="col-xs-12 col-sm-4 col-md-2">
 					<label class="label-item single-overflow pull-left" title="状态：">状态：</label>
 					<form:select path="status"  class="form-control m-b input-sm">
 						<form:option value="" label="全部"/>
 						<form:options items="${fns:getDictList('out_status')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 					</form:select>
 				</div>
-				<div class="col-xs-6 col-sm-3 col-md-3">
+				<div class="col-xs-12 col-sm-4 col-md-2">
 					<label class="label-item single-overflow pull-left" title="企业名称：">企业名称：</label>
 					<form:input path="wsCompany.companyName" htmlEscape="false" maxlength="100"  class=" form-control input-sm"/>
 				</div>
-				<div class="col-xs-6 col-sm-3 col-md-3">
-					<label class="label-item single-overflow pull-left" title="身份证号：">身份证号：</label>
-					<form:input path="idcardNumber" htmlEscape="false" maxlength="100"  class=" form-control input-sm"/>
-				</div>
 		 <div class="col-xs-6 col-sm-3 col-md-3">
 			<div style="margin-top:26px">
 			  <a  id="search" class="btn btn-primary btn-rounded  btn-bordered btn-sm"><i class="fa fa-search"></i> 查询</a>

happy-job-module-hpjob/src/main/java/com/jeeplus/modules/wsstaff/mapper/xml/WsStaffMapper.xml

@@ -51,6 +51,9 @@
 		<where>
 
 			${dataScope}
+			<if test="userName != null and userName'' ">
+				AND a.user_name = #{userName}
+			</if>
 			<if test="status != null">
 				AND a.status = #{status}
 			</if>
@@ -81,6 +84,9 @@
 		<where>
 
 			${dataScope}
+			<if test="userName != null and userName'' ">
+				AND a.user_name = #{userName}
+			</if>
 			<if test="status != null">
 				AND a.status = #{status}
 			</if>