Merge remote-tracking branch 'origin/master'

fuliqi

2024-09-18 d9e7d3b630c9d905bc1340fe61740712bb610fde

 ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml

@@ -40,6 +40,9 @@
            <if test="query.unitName != null and query.unitName != '' ">
                AND tyu.unit_name like concat('%', #{query.unitName}, '%')
            </if>
            <if test="query.unitId != null">
                AND tyu.id = #{query.unitId}
            </if>
        </where>
    </select>