From 03f43fde95bc04589aca0bce1f8b116c7140370a Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Fri, 4 Jun 2021 16:58:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E3=80=90ID1004129=E3=80=91=E3=80=90?=
 =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E3=80=91=E4=B8=80=E4=B8=AA=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=8F=96=E6=B6=88=E6=94=B6=E8=97=8F=E5=90=8E=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96=E6=94=B6=E8=97=8F=E7=9A=84=E7=94=A8=E6=88=B7=E4=B9=9F?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/controller/panel/server/StoreServer.java | 9 ++-------
 .../java/io/dataease/service/panel/StoreService.java     | 7 ++++---
 frontend/src/views/panel/enshrine/index.vue              | 2 +-
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/backend/src/main/java/io/dataease/controller/panel/server/StoreServer.java b/backend/src/main/java/io/dataease/controller/panel/server/StoreServer.java
index 270c153980..24073a2b52 100644
--- a/backend/src/main/java/io/dataease/controller/panel/server/StoreServer.java
+++ b/backend/src/main/java/io/dataease/controller/panel/server/StoreServer.java
@@ -26,12 +26,7 @@ public class StoreServer implements StoreApi {
     }
 
     @Override
-    public void remove(String storeId) {
-        try {
-            Long id = Long.parseLong(storeId);
-            storeService.remove(id);
-        } catch (Exception e) {
-            storeService.removeByPanelId(storeId);
-        }
+    public void remove(String panelId) {
+        storeService.removeByPanelId(panelId);
     }
 }
diff --git a/backend/src/main/java/io/dataease/service/panel/StoreService.java b/backend/src/main/java/io/dataease/service/panel/StoreService.java
index 9d3dbd3bae..de25085f3c 100644
--- a/backend/src/main/java/io/dataease/service/panel/StoreService.java
+++ b/backend/src/main/java/io/dataease/service/panel/StoreService.java
@@ -34,14 +34,15 @@ public class StoreService {
     }
 
     public void removeByPanelId(String panelId) {
+        Long userId = AuthUtils.getUser().getUserId();
         PanelStoreExample panelStoreExample = new PanelStoreExample();
-        panelStoreExample.createCriteria().andPanelGroupIdEqualTo(panelId);
+        panelStoreExample.createCriteria().andPanelGroupIdEqualTo(panelId).andUserIdEqualTo(userId);
         panelStoreMapper.deleteByExample(panelStoreExample);
     }
 
-    public void remove(Long storeId) {
+    /*public void remove(Long storeId) {
         panelStoreMapper.deleteByPrimaryKey(storeId);
-    }
+    }*/
 
     /**
      * 按照当前用户ID查询收藏仪表板
diff --git a/frontend/src/views/panel/enshrine/index.vue b/frontend/src/views/panel/enshrine/index.vue
index 795e995e5f..8a2f1449da 100644
--- a/frontend/src/views/panel/enshrine/index.vue
+++ b/frontend/src/views/panel/enshrine/index.vue
@@ -67,7 +67,7 @@ export default {
       return data
     },
     remove(row) {
-      deleteEnshrine(row.storeId).then(res => {
+      deleteEnshrine(row.panelGroupId).then(res => {
         this.initData()
         this.panelInfo && this.panelInfo.id && row.panelGroupId === this.panelInfo.id && this.setMainNull()
       })