Merge branch 'dev_cr' into dev

zhuo

2025-03-10 ac9ba01f811d9755204a82bd7bd9a444139711fd

 basic-server/src/main/resources/mapper/StandardTreeMapper.xml

@@ -329,6 +329,7 @@
        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
            ${ew.customSqlSegment}
        </if>
        ORDER BY declare_date DESC
    </select>
    <select id="selectIfsInventoryQuantity" resultType="com.ruoyi.basic.dto.IfsInventoryQuantityCheckDto">
        SELECT * from ifs_inventory_quantity ifs
@@ -378,10 +379,12 @@
        select model label,
               model value
        from standard_tree
        where sample_type in
        <foreach item="item" collection="sampleTypeValues" open="(" separator="," close=")">
            #{item}
        </foreach>
          and sample is null
        where sample is null
        <if test="sampleTypeValues != null and sampleTypeValues.size() > 0">
            and sample_type in
            <foreach item="item" collection="sampleTypeValues" open="(" separator="," close=")">
                #{item}
            </foreach>
        </if>
    </select>
</mapper>