Merge remote-tracking branch 'origin/master'

rain

2026-01-29 7941db00ace2a95cf5d65b51d7ad600c225b2eda

 drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdDataObjectionMapper.xml

@@ -37,11 +37,12 @@
            ja_gd_data_objection do
        left join
                ja_gd_data_objection_attachment da
                on do.id = da.objection_id
                on do.id = da.objection_id and da.is_deleted = 0
        left join
                blade_dept bd on bd.id = do.create_dept
        <where>
                do.is_deleted = 0
                and da.is_deleted = 0
            <if test="param2.title != null and param2.title != ''">
                and do.title like concat('%',#{param2.title},'%')
            </if>
@@ -64,10 +65,16 @@
    </select>

    <select id="getDetail" resultType="org.sxkj.gd.orderdata.vo.GdDataObjectionVO">
        select do.*, GROUP_CONCAT(da.attach_name SEPARATOR ',') as attach_names ,GROUP_CONCAT(da.attach_id SEPARATOR ',') as attach_ids
        from ja_gd_data_objection do
        left join ja_gd_data_objection_attachment da on do.id = da.objection_id
        select
            do.*,
            GROUP_CONCAT(da.attach_name SEPARATOR ',') as attach_names ,
            GROUP_CONCAT(da.attach_id SEPARATOR ',') as attach_ids
        from
            ja_gd_data_objection do
        left join
                ja_gd_data_objection_attachment da on do.id = da.objection_id
        <where>
                and da.is_deleted = 0
            <if test="id != null ">
                and do.id = #{id}
            </if>