Commit 2918df52 authored by wangzb's avatar wangzb

feature-wzb :合同处bug修复

parent 82334943
...@@ -653,16 +653,12 @@ ...@@ -653,16 +653,12 @@
a.LEAVE_DATE, a.LEAVE_DATE,
a.CONTRACT_NO, a.CONTRACT_NO,
a.REDUCE_REASON, a.REDUCE_REASON,
b.AUDIT_STATUS,
b.REMARK b.REMARK
FROM t_employee_contract_info a FROM t_employee_contract_info a
join t_employee_contract_audit b on a.ID=b.LINK_ID left join (select REMARK,LINK_ID from t_employee_contract_audit where ROOT_NAME='合同审核') b on a.ID=b.LINK_ID
<where> <where>
a.DELETE_FLAG = 0 a.DELETE_FLAG = 0
and b.ROOT_NAME='合同审核'
<include refid="tEmployeeContractInfo_where"/> <include refid="tEmployeeContractInfo_where"/>
<if test="tEmployeeContractInfo.authSql != null and tEmployeeContractInfo.authSql.trim() != ''"> <if test="tEmployeeContractInfo.authSql != null and tEmployeeContractInfo.authSql.trim() != ''">
${tEmployeeContractInfo.authSql} ${tEmployeeContractInfo.authSql}
...@@ -680,10 +676,8 @@ ...@@ -680,10 +676,8 @@
SELECT SELECT
count(1) count(1)
FROM t_employee_contract_info a FROM t_employee_contract_info a
join t_employee_contract_audit b on a.ID=b.LINK_ID
<where> <where>
a.DELETE_FLAG = 0 a.DELETE_FLAG = 0
and b.ROOT_NAME='合同审核'
<include refid="tEmployeeContractInfo_where"/> <include refid="tEmployeeContractInfo_where"/>
<if test="tEmployeeContractInfo.authSql != null and tEmployeeContractInfo.authSql.trim() != ''"> <if test="tEmployeeContractInfo.authSql != null and tEmployeeContractInfo.authSql.trim() != ''">
${tEmployeeContractInfo.authSql} ${tEmployeeContractInfo.authSql}
......
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