From 106de4cf618cd32ae219e464dd7e0d92221b6962 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sun, 25 Apr 2021 14:01:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9categorylist=E5=85=A5?= =?UTF-8?q?=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/resi/group/dto/act/form/ActCategoryFormDTO.java | 4 ++-- .../modules/act/service/impl/ActCategoryDictServiceImpl.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/ActCategoryFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/ActCategoryFormDTO.java index 11f4dfc2f5..2844222e5e 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/ActCategoryFormDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/ActCategoryFormDTO.java @@ -21,8 +21,8 @@ public class ActCategoryFormDTO implements Serializable { /** * 组Id */ - @NotBlank(message = "categoryCode不能为空", groups = ActCategoryFormDTO.AddUserInternalGroup.class) - private String categoryCode; + @NotBlank(message = "menuCode不能为空", groups = ActCategoryFormDTO.AddUserInternalGroup.class) + private String menuCode; @NotBlank(message = "tokenDto获取customerId为空", groups = ActCategoryFormDTO.AddUserInternalGroup.class) private String customerId; diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActCategoryDictServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActCategoryDictServiceImpl.java index c0f5582203..33cabb7659 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActCategoryDictServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActCategoryDictServiceImpl.java @@ -79,9 +79,9 @@ public class ActCategoryDictServiceImpl extends BaseServiceImpl queryCategoryList(ActCategoryFormDTO formDTO) { - List list = baseDao.selectCategoryList(formDTO.getCategoryCode(), formDTO.getCustomerId()); + List list = baseDao.selectCategoryList(formDTO.getMenuCode(), formDTO.getCustomerId()); if (CollectionUtils.isEmpty(list)) { - list = baseDao.selectCategoryList(formDTO.getCategoryCode(), GroupActConstant.DEFAULT_CUSTOMER_ID); + list = baseDao.selectCategoryList(formDTO.getMenuCode(), GroupActConstant.DEFAULT_CUSTOMER_ID); } return list; }