Commit b9918bf9 authored by wangzb's avatar wangzb

feature-wzb :员工合同模块修复功能

parent a28d9ba2
......@@ -402,7 +402,9 @@
<if test="tEmployeeContractInfo.applyNo != null and tEmployeeContractInfo.applyNo.trim() != ''">
AND a.APPLY_NO = #{tEmployeeContractInfo.applyNo}
</if>
<if test="tEmployeeContractInfo.auditStatus != null">
AND a.AUDIT_STATUS = #{tEmployeeContractInfo.auditStatus}
</if>
<if test="tEmployeeContractInfo.empNatrue != null and tEmployeeContractInfo.empNatrue.trim() != ''">
AND a.EMP_NATRUE = #{tEmployeeContractInfo.empNatrue}
</if>
......@@ -427,10 +429,8 @@
SELECT
<include refid="Base_Column_List"/>
FROM t_employee_contract_info a
join t_employee_contract_audit b on a.ID=b.LINK_ID
<where>
a.DELETE_FLAG = 0
and b.ROOT_NAME='合同审核'
<include refid="tEmployeeContractInfo_where"/>
<if test="tEmployeeContractInfo.authSql != null and tEmployeeContractInfo.authSql.trim() != ''">
${tEmployeeContractInfo.authSql}
......@@ -444,9 +444,6 @@
SELECT
<include refid="Base_Column_List"/>
FROM t_employee_contract_info a
join t_employee_contract_audit b on a.ID=b.LINK_ID
<where>
a.DELETE_FLAG = 0
<include refid="tEmployeeContractInfo_where"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment