提交 03f43fde authored 作者: fit2cloud-chenyw's avatar fit2cloud-chenyw

fix: 【ID1004129】【仪表板】一个用户取消收藏后其他收藏的用户也没有了

上级 d2ac09d6
...@@ -26,12 +26,7 @@ public class StoreServer implements StoreApi { ...@@ -26,12 +26,7 @@ public class StoreServer implements StoreApi {
} }
@Override @Override
public void remove(String storeId) { public void remove(String panelId) {
try { storeService.removeByPanelId(panelId);
Long id = Long.parseLong(storeId);
storeService.remove(id);
} catch (Exception e) {
storeService.removeByPanelId(storeId);
}
} }
} }
...@@ -34,14 +34,15 @@ public class StoreService { ...@@ -34,14 +34,15 @@ public class StoreService {
} }
public void removeByPanelId(String panelId) { public void removeByPanelId(String panelId) {
Long userId = AuthUtils.getUser().getUserId();
PanelStoreExample panelStoreExample = new PanelStoreExample(); PanelStoreExample panelStoreExample = new PanelStoreExample();
panelStoreExample.createCriteria().andPanelGroupIdEqualTo(panelId); panelStoreExample.createCriteria().andPanelGroupIdEqualTo(panelId).andUserIdEqualTo(userId);
panelStoreMapper.deleteByExample(panelStoreExample); panelStoreMapper.deleteByExample(panelStoreExample);
} }
public void remove(Long storeId) { /*public void remove(Long storeId) {
panelStoreMapper.deleteByPrimaryKey(storeId); panelStoreMapper.deleteByPrimaryKey(storeId);
} }*/
/** /**
* 按照当前用户ID查询收藏仪表板 * 按照当前用户ID查询收藏仪表板
......
...@@ -67,7 +67,7 @@ export default { ...@@ -67,7 +67,7 @@ export default {
return data return data
}, },
remove(row) { remove(row) {
deleteEnshrine(row.storeId).then(res => { deleteEnshrine(row.panelGroupId).then(res => {
this.initData() this.initData()
this.panelInfo && this.panelInfo.id && row.panelGroupId === this.panelInfo.id && this.setMainNull() this.panelInfo && this.panelInfo.id && row.panelGroupId === this.panelInfo.id && this.setMainNull()
}) })
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论