From c74eb5caa1626ba6f1ae7faf49f3214cee964509 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sat, 25 Aug 2018 15:23:08 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BC=9A=E5=91=98=E7=AE=A1=E7=90=86][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E8=AF=A6=E6=83=85=E5=92=8C=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/simple/controller/WxCUserBasicInfoController.java | 2 +- .../src/main/java/com/simple/domain/po/MallUserInfo.java | 1 + .../src/main/resources/mapper/WxCUserBasicInfoMapper.xml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java index f60ce2cc1..7f3596889 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java @@ -149,7 +149,7 @@ public class WxCUserBasicInfoController extends BaseController public ResultData findById(Long id) { WxCUserBasicInfo info = wxCUserBasicInfoService.getById(id); if(info.getTagId()!=null) { - WxCUserTags uTag = wxCUserTagsService.getById(id); + WxCUserTags uTag = wxCUserTagsService.getById(info.getTagId()); if(StringUtils.isNotBlank(uTag.getTags())) { List ids = JSONObject.parseArray(uTag.getTags(),Long.class); WxTags wxTags =new WxTags(); diff --git a/mallinkService/src/main/java/com/simple/domain/po/MallUserInfo.java b/mallinkService/src/main/java/com/simple/domain/po/MallUserInfo.java index 3c6a4665b..9cf5b37cd 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/MallUserInfo.java +++ b/mallinkService/src/main/java/com/simple/domain/po/MallUserInfo.java @@ -74,6 +74,7 @@ public class MallUserInfo implements Serializable { @Transient private List permission; //拥有的菜单权限 + @Transient private String menus; public String getMenus() { diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml index b4315b23b..fc9c210a5 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -22,7 +22,7 @@ `id`,`phone`,`birthdate`,`education`,`sex`,`email`,`address`,`poins`,`tag_id`,`c_user_id`, - `create_date`,`update_date`,`tenant_id`,`name`,level,nickName + `create_date`,`update_date`,`tenant_id`,`name`,level,nick_name