Merge branch 'fix/teambition/2024-10-28' into 'master_dev'

DeviceMapper.findDevicesByDeviceTypeAndOrganizationId方法优化

See merge request yunteng/thingskit!458

@@ -563,12 +563,18 @@
         </foreach>
     </select>
     <select id="findDevicesByDeviceTypeAndOrganizationId" resultMap="deviceMap">
-        SELECT
+        SELECT DISTINCT
         <include refid="basicColumns"/>,dev.transport_type
         FROM device ifd
         left join device_profile dev on ifd.device_profile_id = dev.id
         <if test="isSceneLinkage == true or isExcludeEdge == true or isExcludeCloud == true">
-            LEFT JOIN relation re on re.to_id = ifd.id and re.from_type = 'EDGE'  and( re.relation_type = 'ManagedByEdge' or re.relation_type = 'Contains')
+            LEFT JOIN relation re on re.to_id = ifd.id and re.from_type = 'EDGE'  and
+            (
+                re.relation_type = 'ManagedByEdge'
+                <if test="isSceneLinkage == true">
+                    or re.relation_type = 'Contains'
+                </if>
+            )
         </if>
 <!--        <if test="edgeId != null">-->
 <!--            LEFT JOIN relation re on re.to_id = ifd.id-->