Merge branch 'doubleEleven2020'

mec-biz/src/main/java/com/ym/mec/biz/dal/page/EmployeeInfoQueryInfo.java

@@ -28,6 +28,8 @@ public class EmployeeInfoQueryInfo extends QueryInfo {
 	@ApiModelProperty(value = "状态", required = false)
 	private StaffStatusEnum status;
 	
+	private String operator;
+	
 	private Date startDate;
 	
 	private Date endDate;
@@ -95,4 +97,12 @@ public class EmployeeInfoQueryInfo extends QueryInfo {
 	public void setEndDate(Date endDate) {
 		this.endDate = endDate;
 	}
+
+	public String getOperator() {
+		return operator;
+	}
+
+	public void setOperator(String operator) {
+		this.operator = operator;
+	}
 }

mec-biz/src/main/resources/config/mybatis/EmployeeInfoMapper.xml

@@ -144,6 +144,9 @@
 	        <if test="endDate != null">
 	            AND ei.update_time_ &lt;= #{endDate}
 	        </if>
+	        <if test="operator != null">
+	            AND (ei.operator_id_ like concat('%',#{operator},'%') or u.real_name_ like concat('%',#{operator},'%'))
+	        </if>
 		</where>
     </sql>
 
@@ -162,6 +165,7 @@
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(ei.id_) FROM employee_info ei
+		left join sys_user u on u.id_ = ei.operator_id_
         <include refid="queryPageMap"/>
 	</select>
 </mapper>