From b04753affc29f1042d0eb75b0af87824a0f4a8aa Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期五, 09 八月 2024 15:41:48 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ycl-server/src/main/resources/mapper/zgyw/ContractResultMapper.xml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ycl-server/src/main/resources/mapper/zgyw/ContractResultMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/ContractResultMapper.xml index 9ff0965..5d46ac7 100644 --- a/ycl-server/src/main/resources/mapper/zgyw/ContractResultMapper.xml +++ b/ycl-server/src/main/resources/mapper/zgyw/ContractResultMapper.xml @@ -9,11 +9,11 @@ ct.name AS contractName FROM t_contract_result c LEFT JOIN - t_yw_unit u ON c.unit_id = u.id and u.deleted = '0' + t_yw_unit u ON c.unit_id = u.id and u.deleted = 0 LEFT JOIN - t_contract ct ON c.contract_id = ct.id and ct.deleted = '0' + t_contract ct ON c.contract_id = ct.id and ct.deleted = 0 where - c.deleted = '0' + c.deleted = 0 <if test="unitId != null"> AND c.unit_id = #{unitId} </if> -- Gitblit v1.8.0