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

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractInfoMapper.xml

@@ -796,7 +796,11 @@
 		       count(1)
 		from t_employee_contract_info e
 		where e.EMP_IDCARD = #{empIdCard} and e.SETTLE_DOMAIN = #{deptId}
-		  and e.DELETE_FLAG = '0' and e.IS_OBSOLETE = '0'
-		  and e.situation !='作废' and e.situation !='终止' and e.AUDIT_STATUS != 3
+			  and e.DELETE_FLAG = '0'
+			  AND (
+					( e.AUDIT_STATUS = '2' AND e.IN_USE = '0' )
+					OR
+					( e.AUDIT_STATUS = '1' AND e.IN_USE = '1' )
+			  )
 	</select>
 </mapper>