Commit e6178386 authored by huyuchen's avatar huyuchen

Merge remote-tracking branch 'origin/MVP1.7.12' into MVP1.7.12

parents 81727284 b61600c4
......@@ -172,9 +172,6 @@
<if test="tAutoContractScheme.contractEnd != null">
AND a.CONTRACT_END = #{tAutoContractScheme.contractEnd}
</if>
<if test="tAutoContractScheme.contractEndOther != null and tAutoContractScheme.contractEndOther.trim() != ''">
AND a.CONTRACT_END_OTHER = #{tAutoContractScheme.contractEndOther}
</if>
<if test="tAutoContractScheme.tryPeriodType != null and tAutoContractScheme.tryPeriodType.trim() != ''">
AND a.TRY_PERIOD_TYPE = #{tAutoContractScheme.tryPeriodType}
</if>
......
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