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

ruoyi-ui/src/views/bookmark/index/index.vue

@@ -22,13 +22,12 @@
         <ul id="treeDemo" class="ztree" ></ul>
       </div>
       <div class="reminder">工具箱</div>
-      <div class="aside-title"><i class="el-icon-s-tools"></i><span>收藏同步</span></div>
+      <div class="aside-title"><i class="el-icon-s-flag" style="color: red"></i><span>书签同步</span></div>
-      <div class="aside-title" @click="gorecycle"><i class="el-icon-help"></i><span>回收站</span></div>
+      <div class="aside-title"><i class="el-icon-s-management" ></i><span>标签管理</span></div>
-      <div class="aside-title" @click="importHtml">
+      <div class="aside-title" @click="gorecycle"><i class="el-icon-delete-solid"></i><span>回收站</span></div>
-        <i class="el-icon-s-platform"></i><span>导入书签</span>
+      <div class="aside-title" @click="importHtml"><i class="el-icon-s-platform"></i><span>导入书签</span></div>
-      </div>
+      <div class="aside-title"><i class="el-icon-s-comment"></i><span>意见反馈</span></div>
-      <div class="aside-title"><i class="el-icon-message-solid"></i><span>意见反馈</span></div>
+      <div class="aside-title"><i class="el-icon-s-grid"></i><span>其他设置</span></div>
-      <div class="aside-title"><i class="el-icon-message-solid"></i><span>其他设置</span></div>
 
 <!--      <el-footer class="aside-navigation">-->
 <!--      </el-footer>-->

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);
     }
 }

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
     </select>
 
-    <select id="selectBydelete" parameterType="SqBookmark"  resultMap="SqBookmarkResult">
-        <include refid="selectSqBookmarkVo"/>
-        where  userid=#{userID} and IDelete=1
-    </select>
 
 </mapper>