Merge branch 'cjl' into dev

cjl

2025-01-06 27e6bc3df3e39e0d0b147b155a89ad6837ea972b

 screen-api/src/main/resources/mapper/AllocationExtensionMapper.xml

@@ -43,8 +43,11 @@
        <where>
            1 = 1 and allocationextension.is_del = 0

            <if test="allocation.unitId != null and allocation.unitId != 0">
                and t1.unit_id = #{allocation.unitId}
            <if test="allocation.unitId != null and allocation.unitId.size != 0">
                and t1.unit_id in
                <foreach collection="allocation.unitId" item="id" index="index" open="(" close=")" separator=",">
                    #{id}
                </foreach>
            </if>
            <if test="allocation.polluteType != null and allocation.polluteType != 0">
                and t1.pollute_type = #{allocation.polluteType}