Merge remote-tracking branch 'origin/dev' into cjl

cjl

2024-08-09 a022ae9804d0c2f402711b6b5202319d853919cf

 screen-job/src/main/resources/mapper/OrganizationMapper.xml

@@ -26,4 +26,23 @@
                    <result column="is_delete" property="isDelete" />
        </resultMap>

    <select id="orgIdSpecialDevList" resultType="java.lang.Integer">
        select organization_id from special_device where organization_id in (
            SELECT id FROM (
                               SELECT id, parent_id, name FROM organization  WHERE id = #{organizationId}
                               UNION ALL
                               SELECT i.id, i.parent_id, i.name
                               FROM organization  i
                                        INNER JOIN (
                                   SELECT * FROM (
                                                     SELECT id, parent_id, name FROM organization  WHERE id = #{organizationId}
                                                     UNION ALL
                                                     SELECT id, parent_id, name FROM organization WHERE parent_id = #{organizationId}
                                                 ) t1
                               ) t2 ON i.parent_id = t2.id
                               where i.is_delete = 0
                           ) t3 ) and mac = #{mac} and is_delete = 0


    </select>
</mapper>