Merge remote-tracking branch 'origin/master'

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

@@ -12,12 +12,23 @@ public class EmployeeQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "部门ID",required = true)
     private String organId;
 
+    @ApiModelProperty(value = "工作类型",required = true)
+    private String jobNature;
+
     @ApiModelProperty(value = "角色ID",required = false)
     private Long roleId;
 
     @ApiModelProperty(value = "用户名或电话",required = false)
     private Long userNameOrPhone;
 
+    public String getJobNature() {
+        return jobNature;
+    }
+
+    public void setJobNature(String jobNature) {
+        this.jobNature = jobNature;
+    }
+
     public String getOrganId() {
         return organId;
     }

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

@@ -187,6 +187,9 @@
             <if test="organId != null">
                 AND INTE_ARRAY(e.organ_id_list_,#{organId})
             </if>
+            <if test="jobNature != null">
+                AND e.job_nature_ = #{jobNature}
+            </if>
             <if test="search != null">
                 AND (su.real_name_ LIKE CONCAT('%',#{search},'%') OR su.phone_ LIKE CONCAT('%',#{search},'%'))
             </if>