drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml
@@ -99,7 +99,7 @@ ps.contact_person as police_station_contact_person, ps.contact_phone as police_station_contact_phone from ja_fw_area_divide ad left join ja_fw_police_station ps on ps.id = ad.police_station_id::VARCHAR and ps.is_deleted = 0 left join ja_fw_police_station ps on ps.id::VARCHAR = ad.police_station_id::VARCHAR and ps.is_deleted = 0 <where> ad.is_deleted = 0 <if test="deptList != null and deptList.size > 0"> @@ -234,7 +234,7 @@ ps.contact_person as police_station_contact_person, ps.contact_phone as police_station_contact_phone from ja_fw_area_divide ad left join ja_fw_police_station ps on ps.id = ad.police_station_id::VARCHAR and ps.is_deleted = 0 left join ja_fw_police_station ps on ps.id::VARCHAR = ad.police_station_id::VARCHAR and ps.is_deleted = 0 where ad.is_deleted = 0 and ad.id = #{id} </select> @@ -467,7 +467,7 @@ ps.contact_person as police_station_contact_person, ps.contact_phone as police_station_contact_phone from ja_fw_area_divide ad left join ja_fw_police_station ps on ps.id = ad.police_station_id::VARCHAR and ps.is_deleted = 0 left join ja_fw_police_station ps on ps.id::VARCHAR = ad.police_station_id::VARCHAR and ps.is_deleted = 0 inner join ( SELECT d.id @@ -565,7 +565,7 @@ select count(1) from ja_fw_defense_scene_manage dsm left join ja_fw_defense_scene ds on ds.id = dsm.defense_scene_id::VARCHAR and ds.is_deleted = 0 left join ja_fw_defense_scene ds on ds.id::VARCHAR = dsm.defense_scene_id::VARCHAR and ds.is_deleted = 0 where ds.is_deleted = 0 and #{areaId} = ANY(string_to_array(ds.area_divide_ids, ',')::bigint[]) and dsm.is_deleted = 0 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneManageMapper.xml
@@ -26,7 +26,7 @@ dsm.*, ds.scene_name as defense_scene_name from ja_fw_defense_scene_manage dsm left join ja_fw_defense_scene ds on ds.id = dsm.defense_scene_id::VARCHAR and ds.is_deleted = 0 left join ja_fw_defense_scene ds on ds.id::VARCHAR = dsm.defense_scene_id::VARCHAR and ds.is_deleted = 0 <where> dsm.is_deleted = 0 <if test="param2.name != null and param2.name != ''"> @@ -46,7 +46,7 @@ dsm.*, ds.scene_name as defense_scene_name from ja_fw_defense_scene_manage dsm left join ja_fw_defense_scene ds on ds.id = dsm.defense_scene_id::VARCHAR and ds.is_deleted = 0 left join ja_fw_defense_scene ds on ds.id::VARCHAR = dsm.defense_scene_id::VARCHAR and ds.is_deleted = 0 where dsm.is_deleted = 0 and dsm.id = #{id} </select> @@ -72,7 +72,7 @@ and ad.id = ANY(string_to_array(ds.area_divide_ids, ',')::bigint[]) ) as device_count from ja_fw_defense_scene_manage dsm left join ja_fw_defense_scene ds on ds.id = dsm.defense_scene_id::VARCHAR and ds.is_deleted = 0 left join ja_fw_defense_scene ds on ds.id::VARCHAR = dsm.defense_scene_id::VARCHAR and ds.is_deleted = 0 <where> dsm.is_deleted = 0 <if test="time != null"> @@ -102,7 +102,7 @@ SELECT ad.device_ids FROM ja_fw_defense_scene_manage dsm LEFT JOIN ja_fw_defense_scene ds ON ds.id = dsm.defense_scene_id::VARCHAR AND ds.is_deleted = 0 LEFT JOIN ja_fw_defense_scene ds ON ds.id::VARCHAR = dsm.defense_scene_id::VARCHAR AND ds.is_deleted = 0 LEFT JOIN ja_fw_area_divide ad ON ad.id = ANY(string_to_array(ds.area_divide_ids, ',')::bigint[]) AND ad.is_deleted = 0 WHERE dsm.id = #{id} ) ad ON CHAR_LENGTH(ad.device_ids) - CHAR_LENGTH(REPLACE(ad.device_ids, ',', '')) >= numbers.n - 1 @@ -114,7 +114,7 @@ dsm.*, ds.scene_name as defense_scene_name from ja_fw_defense_scene_manage dsm left join ja_fw_defense_scene ds on ds.id = dsm.defense_scene_id::VARCHAR and ds.is_deleted = 0 left join ja_fw_defense_scene ds on ds.id::VARCHAR = dsm.defense_scene_id::VARCHAR and ds.is_deleted = 0 left join ja_fw_area_divide ad on ad.id = ANY(string_to_array(ds.area_divide_ids, ',')::bigint[]) and ad.is_deleted = 0 inner join ( SELECT drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseZoneMapper.xml
@@ -96,7 +96,7 @@ and ds.area_divide_ids is not null and ds.area_divide_ids != '' and ad.id = ANY(string_to_array(replace(ds.area_divide_ids, ' ', ''), ',')::bigint[]) left join ja_fw_police_station ps on ps.id = ad.police_station_id::VARCHAR and ps.is_deleted = 0 left join ja_fw_police_station ps on ps.id::VARCHAR = ad.police_station_id::VARCHAR and ps.is_deleted = 0 </select>
