fix:分配边端设备排除云端GBT28181

@@ -567,18 +567,16 @@
         <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">
-        <!--此设备是边端创建或者已经分配给边端-->
+        <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')
         </if>
-
-        <if test="edgeId != null">
-            LEFT JOIN relation re on re.to_id = ifd.id
-            and re.from_id =#{edgeId}
-            and re.from_type = 'EDGE'
-            and re.relation_type_group = 'EDGE'
-            and re.relation_type = 'Contains'
-        </if>
+<!--        <if test="edgeId != null">-->
+<!--            LEFT JOIN relation re on re.to_id = ifd.id-->
+<!--            and re.from_id =#{edgeId}-->
+<!--            and re.from_type = 'EDGE'-->
+<!--            and re.relation_type_group = 'EDGE'-->
+<!--            and re.relation_type = 'Contains'-->
+<!--        </if>-->
         <if test="isEdgeDistribution == true">
             <!--此设备是否已被场景联动使用-->
             LEFT JOIN tk_do_action action on  action.device_id LIKE CONCAT('%',ifd.id ,'%')
@@ -588,17 +586,17 @@
         where
         1=1
         <if test="isExcludeEdge == true">
-            and ifd.id not in (SELECT dev.id from device dev inner join relation re_edge on dev.id=re_edge.to_id and re_edge.from_type = 'EDGE'  and re_edge.relation_type = 'ManagedByEdge')
+            and (dev.transport_type!='GBT28181' or re.to_id is null)
         </if>
         <if test="isExcludeCloud == true">
-            and ifd.id in (SELECT dev.id from device dev inner join relation re_edge on dev.id=re_edge.to_id and re_edge.from_type = 'EDGE'  and re_edge.relation_type = 'ManagedByEdge')
+            and (dev.transport_type!='GBT28181' or re.to_id is not null)
         </if>
         <if test="isSceneLinkage == true">
             and re.to_id is null
         </if>
-        <if test="edgeId != null">
-            and re.from_id is null
-        </if>
+<!--        <if test="edgeId != null">-->
+<!--            and re.from_id is null-->
+<!--        </if>-->
         <if test="isEdgeDistribution == true">
             and action.device_id is null
             and cond.entity_id is null