From 5ce66b32f91458d4015a18ec5c9c1932e54a1e65 Mon Sep 17 00:00:00 2001 From: taochengbo <552920369@qq.com> Date: Mon, 18 May 2020 21:39:34 +0800 Subject: [PATCH] =?UTF-8?q?bug--=E5=AD=97=E5=85=B8=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=97=A0=E6=95=88=E3=80=81=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/co/yixiang/modules/system/domain/DictDetail.java | 3 +++ .../co/yixiang/modules/system/rest/DictDetailController.java | 1 + .../java/co/yixiang/modules/system/rest/MenuController.java | 2 +- .../yixiang/modules/system/service/impl/MenuServiceImpl.java | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/domain/DictDetail.java b/yshop-system/src/main/java/co/yixiang/modules/system/domain/DictDetail.java index 0b1af75f..656b1ed1 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/domain/DictDetail.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/domain/DictDetail.java @@ -45,6 +45,9 @@ public class DictDetail implements Serializable { /** 字典id */ private Long dictId; + @TableField(exist = false) + private Dict dict; + /** 创建日期 */ @TableField(fill= FieldFill.INSERT) diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/rest/DictDetailController.java b/yshop-system/src/main/java/co/yixiang/modules/system/rest/DictDetailController.java index e8ea2b01..aabb69ae 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/rest/DictDetailController.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/rest/DictDetailController.java @@ -73,6 +73,7 @@ public class DictDetailController { if (resources.getId() != null) { throw new BadRequestException("A new "+ ENTITY_NAME +" cannot already have an ID"); } + resources.setDictId(resources.getDict().getId()); return new ResponseEntity<>(dictDetailService.save(resources),HttpStatus.CREATED); } diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/rest/MenuController.java b/yshop-system/src/main/java/co/yixiang/modules/system/rest/MenuController.java index 1d1d277f..411aca5f 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/rest/MenuController.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/rest/MenuController.java @@ -112,7 +112,7 @@ public class MenuController { throw new EntityExistException(Menu.class,"name",resources.getName()); } if(StringUtils.isNotBlank(resources.getComponentName())){ - menu = menuService.getOne(new QueryWrapper().eq("componentName",resources.getComponentName())); + menu = menuService.getOne(new QueryWrapper().eq("component_name",resources.getComponentName())); if(menu != null){ throw new EntityExistException(Menu.class,"componentName",resources.getComponentName()); } diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/MenuServiceImpl.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/MenuServiceImpl.java index 9d6572be..4fd7e071 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/MenuServiceImpl.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/MenuServiceImpl.java @@ -309,7 +309,7 @@ public class MenuServiceImpl extends BaseServiceImpl implement } if(StringUtils.isNotBlank(resources.getComponentName())){ - menu1 = this.getOne(new QueryWrapper().eq("componentName",resources.getComponentName())); + menu1 = this.getOne(new QueryWrapper().eq("component_name",resources.getComponentName())); if(menu1 != null && !menu1.getId().equals(menu.getId())){ throw new EntityExistException(Menu.class,"componentName",resources.getComponentName()); }