返回图斑的合并图层展示

siwei-modules/siwei-apply/src/main/resources/mapper/YdbpDataMapper.xml

@@ -140,11 +140,12 @@
                 ) AS zs_area,
 
         <if test="hasGeom != null and hasGeom">
-            (SELECT array_to_string(array_agg(ST_AsEWKT(gd.geom)), '|')
+            COALESCE((
+            SELECT ST_AsEWKT(ST_Union(gd.geom))
             FROM t_node_land nl
             LEFT JOIN t_geom_db_details gd ON nl.geom_db_id = gd.upload_id
-            WHERE nl.node_id = bp.id
-            AND gd.geom IS NOT NULL) as geom,
+            WHERE nl.node_id = bp.id AND gd.geom IS NOT NULL
+            ), '') AS geom,
         </if>
         -- left(pf_date,4) AS nf,
         '亩' as  zs_unit,

siwei-modules/siwei-apply/src/main/resources/mapper/YdbpMapper.xml

@@ -72,11 +72,12 @@
             '亩' as yd_unit,
             '亩' as zs_unit,
             <if test="hasGeom != null and hasGeom">
-                (SELECT array_to_string(array_agg(ST_AsEWKT(gd.geom)), '|')
+                COALESCE((
+                SELECT ST_AsEWKT(ST_Union(gd.geom))
                 FROM t_node_land nl
                 LEFT JOIN t_geom_db_details gd ON nl.geom_db_id = gd.upload_id
-                WHERE nl.node_id = bp.id
-                AND gd.geom IS NOT NULL) as geom,
+                WHERE nl.node_id = bp.id AND gd.geom IS NOT NULL
+                ), '') AS geom,
             </if>
             COALESCE (
                     CASE