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 9f746a1f0..5c116ad71 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 @@ -79,7 +79,7 @@ public class SqBookmark /** 0 未删除 1表示删除 */ @Excel(name = "0 未删除 1表示删除") - @Column(name = "IDelete") + @Column(name = "idelete") private Integer idelete; /** 0公开显示 1隐藏显示 2好友显示 3稍后再看 */ @@ -128,4 +128,9 @@ public class SqBookmark this.userid = userid; } + public SqBookmark (String url,Long userid,Integer idelete){ + this.url = url; + this.userid = userid; + this.idelete = idelete; + } } 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 ddb10b6e7..d3124dd56 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 @@ -125,7 +125,7 @@ public class SqBookmarkServiceImpl implements ISqBookmarkService public String insertSqBookmark(SqBookmark sqBookmark) { //判断标签是否已经存在了 999 - List list = sqBookmarkMapper.select(new SqBookmark(sqBookmark.getUrl(),sqBookmark.getUserid())); + List list = sqBookmarkMapper.select(new SqBookmark(sqBookmark.getUrl(),sqBookmark.getUserid(),0)); if (CollectionUtils.isNotEmpty(list)) return list.get(0).getBookmarkId().toString(); @@ -353,7 +353,8 @@ public class SqBookmarkServiceImpl implements ISqBookmarkService // 条件查询 example.createCriteria() .andEqualTo("url", url) - .andEqualTo("userid",userId); + .andEqualTo("userid",userId) + .andEqualTo("idelete",0); return sqBookmarkMapper.selectByExample(example); }