update

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

@@ -25,6 +25,18 @@ public class EmployeeQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "是否离职",required = false)
     private Boolean demissionflag;
 
+    /** 是否冻结 */
+    @ApiModelProperty(value = "是否冻结",required = false)
+    private Boolean lockFlag;
+
+    public Boolean getLockFlag() {
+        return lockFlag;
+    }
+
+    public void setLockFlag(Boolean lockFlag) {
+        this.lockFlag = lockFlag;
+    }
+
     public Boolean getDemissionflag() {
         return demissionflag;
     }

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

@@ -69,11 +69,6 @@
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.Employee" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
-        <!--
-        <selectKey resultClass="int" keyProperty="id" >
-        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
-        </selectKey>
-        -->
         INSERT INTO employee
         (user_id_,organ_id_list_,job_nature_,is_probation_period_,education_background_,graduate_school_,technical_titles_,
         entry_date_,certificate_type_,certificate_num_,update_time_,create_time_,introduction_,demission_date_,contact_address_,postal_code_,dept_id_,dept_ids_,post_ids_,post_dept_ids_)
@@ -240,7 +235,10 @@
             LEFT JOIN sys_user_role sur ON sur.user_id_ = e.user_id_
         </if>
         <where>
-                su.lock_flag_ = 0 AND su.del_flag_ = 0
+                su.del_flag_ = 0
+            <if test="lockFlag != null">
+                AND su.lock_flag_ = #{lockFlag}
+            </if>
             <if test="demissionflag != null and demissionflag == 1">
                 AND e.demission_date_ IS NOT NULL
             </if>