diff --git a/ruoyi-ui/src/views/bookmark/index/index.vue b/ruoyi-ui/src/views/bookmark/index/index.vue index faf2ddb2f..50aca70ca 100644 --- a/ruoyi-ui/src/views/bookmark/index/index.vue +++ b/ruoyi-ui/src/views/bookmark/index/index.vue @@ -22,13 +22,12 @@
工具箱
-
收藏同步
-
回收站
-
- 导入书签 -
-
意见反馈
-
其他设置
+
书签同步
+
标签管理
+
回收站
+
导入书签
+
意见反馈
+
其他设置
diff --git a/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/domain/SqBookmark.java b/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/domain/SqBookmark.java index 58730c8d9..440f76543 100644 --- a/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/domain/SqBookmark.java +++ b/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/domain/SqBookmark.java @@ -82,7 +82,7 @@ public class SqBookmark private Integer start; /** 创建时间 */ - @Transient + @Excel(name = "创建时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; diff --git a/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/mapper/SqBookmarkMapper.java b/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/mapper/SqBookmarkMapper.java index 4d47eac20..58a983b72 100644 --- a/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/mapper/SqBookmarkMapper.java +++ b/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/mapper/SqBookmarkMapper.java @@ -23,13 +23,7 @@ public interface SqBookmarkMapper extends MyMapper * @return 书签管理 */ public List selectBymenuIdUserID(@Param("menuID") Long menuID, @Param("userID") Long userID); - /** - * @auther: Wang - * @date: 2020/08/29 23:03 - * 功能描述: 回收站 - */ - public List selectBydelete(@Param("userID") Long userID); /** * 查询书签管理 * diff --git a/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/impl/SqBookmarkServiceImpl.java b/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/impl/SqBookmarkServiceImpl.java index daced454a..9bbbdf906 100644 --- a/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/impl/SqBookmarkServiceImpl.java +++ b/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/impl/SqBookmarkServiceImpl.java @@ -131,16 +131,20 @@ public class SqBookmarkServiceImpl implements ISqBookmarkService */ @Override public List selectBydelete(Long userId) { - return sqBookmarkMapper.selectBydelete(userId); + SqBookmark sqBookmark= new SqBookmark(); + sqBookmark.setUserid(userId); + sqBookmark.setIdelete(1); //已经删除的书签 + return sqBookmarkMapper.select(sqBookmark); } /** - * 用户全部书签 + * 用户全部书签 不包括已经删除的 * @return */ @Override public List selectByUseridList(Long userId) { SqBookmark sqBookmark= new SqBookmark(); sqBookmark.setUserid(userId); + sqBookmark.setIdelete(0); //未删除的书签 return sqBookmarkMapper.select(sqBookmark); } } diff --git a/ruoyi-yunbookmark/src/main/resources/mapper/bookmark/SqBookmarkMapper.xml b/ruoyi-yunbookmark/src/main/resources/mapper/bookmark/SqBookmarkMapper.xml index fa460c5e7..9b32410db 100644 --- a/ruoyi-yunbookmark/src/main/resources/mapper/bookmark/SqBookmarkMapper.xml +++ b/ruoyi-yunbookmark/src/main/resources/mapper/bookmark/SqBookmarkMapper.xml @@ -117,9 +117,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where menu_id = #{menuID} and userid=#{userID} and IDelete=0 -