修改全部书签和回收站为通用mapper方式调用

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;
 

ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/mapper/SqBookmarkMapper.java

@@ -23,13 +23,7 @@ public interface SqBookmarkMapper extends MyMapper<SqBookmark>
      * @return 书签管理
      */
     public List<SqBookmark> selectBymenuIdUserID(@Param("menuID") Long menuID, @Param("userID") Long userID);
-    /**
-     * @auther: Wang
-     * @date: 2020/08/29 23:03
-     * 功能描述: 回收站
-     */
 
-    public List<SqBookmark> selectBydelete(@Param("userID") Long userID);
     /**
      * 查询书签管理
      *

ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/impl/SqBookmarkServiceImpl.java

@@ -131,16 +131,20 @@ public class SqBookmarkServiceImpl implements ISqBookmarkService
      */
     @Override
     public List<SqBookmark> 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<SqBookmark> selectByUseridList(Long userId) {
         SqBookmark sqBookmark= new SqBookmark();
         sqBookmark.setUserid(userId);
+        sqBookmark.setIdelete(0); //未删除的书签
         return sqBookmarkMapper.select(sqBookmark);
     }
 }