diff --git a/admin/src/main/java/com/jinrui/reference/admin/controller/TagController.java b/admin/src/main/java/com/jinrui/reference/admin/controller/TagController.java index 74f6973..348bf7b 100644 --- a/admin/src/main/java/com/jinrui/reference/admin/controller/TagController.java +++ b/admin/src/main/java/com/jinrui/reference/admin/controller/TagController.java @@ -81,7 +81,7 @@ public class TagController { return PageObject.failedPage(500, "服务端错误,请联系系统管理员!"); } - return tagService.queryTag(6L, needChildren, keyword, exclude, page, size, orderBy, direction); + return tagService.queryTag(parent, needChildren, keyword, exclude, page, size, orderBy, direction); } @GetMapping("/source") diff --git a/core/src/main/java/com/jinrui/reference/core/service/TagService.java b/core/src/main/java/com/jinrui/reference/core/service/TagService.java index 06c9a5a..2413b04 100644 --- a/core/src/main/java/com/jinrui/reference/core/service/TagService.java +++ b/core/src/main/java/com/jinrui/reference/core/service/TagService.java @@ -113,8 +113,11 @@ public class TagService { * @return */ public ResultObject sourceCreate(Long parentId, String name) { + List tagList = tagMapper.queryTag(parentId, name, null, "create_time", null); - + if(tagList!=null && tagList.size()>0){ + return ResultObject.failed("该标签已存在"); + } /** * 目前来源标签写死为1 * id=1的初始化的时候就是来源标签