From b5df0cfdfb8e43355bc60ff68adca554dd1d0228 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 04 三月 2024 10:01:44 +0800
Subject: [PATCH] 解决删除发布图层时会误删图层组

---
 src/main/resources/mapper/data/PublishMapper.xml |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/data/PublishMapper.xml b/src/main/resources/mapper/data/PublishMapper.xml
index fe1b636..dd6c40a 100644
--- a/src/main/resources/mapper/data/PublishMapper.xml
+++ b/src/main/resources/mapper/data/PublishMapper.xml
@@ -103,7 +103,10 @@
     </select>
 
     <select id="selectRaster" resultType="com.moon.server.entity.data.PublishEntity">
-        select * from lf.sys_publish where status = 3 and type in ('DOM', 'DEM');
+        select c.cn_name "name", c.unit, a.*
+        from lf.sys_publish a inner join lf.sys_res b on a.id = b.pubid
+        inner join lf.sys_layer c on b.id = c.resid
+        where a.type in ('DOM', 'DEM') and a.status = 3 and c.status = 1;
     </select>
 
     <select id="selectByLayerId" resultType="com.moon.server.entity.data.PublishEntity">
@@ -175,7 +178,7 @@
     <delete id="deletes">
         delete from lf.sys_role_layer where layerid in (select a.id from lf.sys_layer a inner join lf.sys_res b on a.resid = b.id where b.pubid in (${ids}));
         delete from lf.sys_role_res where resid in (select id from lf.sys_res where pubid in (${ids}));
-        delete from lf.sys_layer where resid in (select id from lf.sys_res where pubid in (${ids}));
+        delete from lf.sys_layer where is_layer = 1 and resid in (select id from lf.sys_res where pubid in (${ids}));
         delete from lf.sys_res where pubid in (${ids});
         delete from lf.sys_meta_pub where pubid in (${ids});
         delete from lf.sys_publish where id in (${ids});

--
Gitblit v1.9.3