Merge remote-tracking branch 'origin/master'

xiangpei

2024-09-04 863b22dd84364ef5a9c4d5057af5063f94e8f346

 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>