drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml
@@ -112,7 +112,7 @@ and exists ( select 1 from ja_fw_defense_scene ds join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id::VARCHAR and dsm.is_deleted = 0 join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id::VARCHAR = ds.id::VARCHAR and dsm.is_deleted = 0 where ds.is_deleted = 0 and ds.area_divide_ids is not null and ds.area_divide_ids != '' @@ -123,7 +123,7 @@ and exists ( select 1 from ja_fw_defense_scene ds join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id::VARCHAR and dsm.is_deleted = 0 join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id::VARCHAR = ds.id::VARCHAR and dsm.is_deleted = 0 where ds.is_deleted = 0 and ds.area_divide_ids is not null and ds.area_divide_ids != '' @@ -264,14 +264,14 @@ ( select string_agg(distinct ds.scene_name) from ja_fw_defense_scene ds join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id::VARCHAR and dsm.is_deleted = 0 join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id::VARCHAR = ds.id::VARCHAR and dsm.is_deleted = 0 where ds.is_deleted = 0 and ad.id = ANY(string_to_array(ds.area_divide_ids, ',')::bigint[]) ) as scene_name, ( select string_agg(distinct ds.scene_type, ',') from ja_fw_defense_scene ds join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id::VARCHAR and dsm.is_deleted = 0 join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id::VARCHAR = ds.id::VARCHAR and dsm.is_deleted = 0 where ds.is_deleted = 0 and ad.id = ANY(string_to_array(ds.area_divide_ids, ',')::bigint[]) ) as scene_type, @@ -316,7 +316,7 @@ and exists ( select 1 from ja_fw_defense_scene ds join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id::VARCHAR and dsm.is_deleted = 0 join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id::VARCHAR = ds.id::VARCHAR and dsm.is_deleted = 0 where ds.is_deleted = 0 and ad.id = ANY(string_to_array(ds.area_divide_ids, ',')::bigint[]) ) @@ -497,7 +497,7 @@ and exists ( select 1 from ja_fw_defense_scene ds join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id::VARCHAR and dsm.is_deleted = 0 join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id::VARCHAR = ds.id::VARCHAR and dsm.is_deleted = 0 where ds.is_deleted = 0 and ds.area_divide_ids is not null and ds.area_divide_ids != '' @@ -508,7 +508,7 @@ and exists ( select 1 from ja_fw_defense_scene ds join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id::VARCHAR and dsm.is_deleted = 0 join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id::VARCHAR = ds.id::VARCHAR and dsm.is_deleted = 0 where ds.is_deleted = 0 and ds.area_divide_ids is not null and ds.area_divide_ids != '' drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneMapper.xml
@@ -68,7 +68,7 @@ select 1 from ja_fw_defense_scene_manage dsm where dsm.is_deleted = 0 and dsm.defense_scene_id = ds.id::VARCHAR and dsm.defense_scene_id::VARCHAR = ds.id::VARCHAR ) <if test="sceneManageId != null"> or exists ( @@ -76,7 +76,7 @@ from ja_fw_defense_scene_manage dsm where dsm.is_deleted = 0 and dsm.id = #{sceneManageId} and dsm.defense_scene_id = ds.id::VARCHAR and dsm.defense_scene_id::VARCHAR = ds.id::VARCHAR ) </if> ) drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml
@@ -298,7 +298,7 @@ and exists ( select 1 from ja_fw_defense_scene ds join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id::VARCHAR and dsm.is_deleted = 0 join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id::VARCHAR = ds.id::VARCHAR and dsm.is_deleted = 0 where ds.is_deleted = 0 and ds.area_divide_ids is not null and ds.area_divide_ids != '' @@ -345,7 +345,7 @@ and exists ( select 1 from ja_fw_defense_scene ds join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id::VARCHAR and dsm.is_deleted = 0 join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id::VARCHAR = ds.id::VARCHAR and dsm.is_deleted = 0 where ds.is_deleted = 0 and ds.area_divide_ids is not null and ds.area_divide_ids != '' @@ -477,7 +477,7 @@ and exists ( select 1 from ja_fw_defense_scene ds join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id::VARCHAR and dsm.is_deleted = 0 join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id::VARCHAR = ds.id::VARCHAR and dsm.is_deleted = 0 where ds.is_deleted = 0 and ds.area_divide_ids is not null and ds.area_divide_ids != '' @@ -515,7 +515,7 @@ and exists ( select 1 from ja_fw_defense_scene ds join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id::VARCHAR and dsm.is_deleted = 0 join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id::VARCHAR = ds.id::VARCHAR and dsm.is_deleted = 0 where ds.is_deleted = 0 and ds.area_divide_ids is not null and ds.area_divide_ids != '' @@ -552,7 +552,7 @@ and exists ( select 1 from ja_fw_defense_scene ds join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id::VARCHAR and dsm.is_deleted = 0 join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id::VARCHAR = ds.id::VARCHAR and dsm.is_deleted = 0 where ds.is_deleted = 0 and ds.area_divide_ids is not null and ds.area_divide_ids != '' @@ -588,7 +588,7 @@ and exists ( select 1 from ja_fw_defense_scene ds join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id::VARCHAR and dsm.is_deleted = 0 join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id::VARCHAR = ds.id::VARCHAR and dsm.is_deleted = 0 where ds.is_deleted = 0 and ds.area_divide_ids is not null and ds.area_divide_ids != '' @@ -624,7 +624,7 @@ and exists ( select 1 from ja_fw_defense_scene ds join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id::VARCHAR and dsm.is_deleted = 0 join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id::VARCHAR = ds.id::VARCHAR and dsm.is_deleted = 0 where ds.is_deleted = 0 and ds.area_divide_ids is not null and ds.area_divide_ids != '' @@ -650,7 +650,7 @@ on ad.id = ANY(string_to_array(ds.area_divide_ids, ',')::bigint[]) and ds.is_deleted = 0 left join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id::VARCHAR on dsm.defense_scene_id::VARCHAR = ds.id::VARCHAR and dsm.is_deleted = 0 <where> d.is_deleted = 0 @@ -659,7 +659,7 @@ and exists ( select 1 from ja_fw_defense_scene ds join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id::VARCHAR and dsm.is_deleted = 0 join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id::VARCHAR = ds.id::VARCHAR and dsm.is_deleted = 0 where ds.is_deleted = 0 and ds.area_divide_ids is not null and ds.area_divide_ids != '' @@ -792,7 +792,7 @@ and exists ( select 1 from ja_fw_defense_scene ds join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id::VARCHAR and dsm.is_deleted = 0 join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id::VARCHAR = ds.id::VARCHAR and dsm.is_deleted = 0 where ds.is_deleted = 0 and ds.area_divide_ids is not null and ds.area_divide_ids != ''
