From 2572fb27da88087a31dda4783f4998641b5f2bad Mon Sep 17 00:00:00 2001 From: zzpay <34701892@qq.com> Date: Wed, 25 Dec 2024 19:30:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=A0=87=E7=AD=BE=E7=9A=84pa?= =?UTF-8?q?rent=E7=94=B1=E5=89=8D=E7=AB=AF=E6=9D=A5=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jinrui/reference/admin/controller/TagController.java | 2 +- .../java/com/jinrui/reference/core/service/TagService.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) 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的初始化的时候就是来源标签