Merge remote-tracking branch 'origin/master'

fuliqi

2024-08-09 b04753affc29f1042d0eb75b0af87824a0f4a8aa

 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>