From 4097545ff54010ef275c7f7a9ec60afed7aed359 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 20 Jul 2020 19:01:12 +0800 Subject: [PATCH] =?UTF-8?q?B=E7=AB=AF=E7=99=BB=E9=99=86=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E9=87=8D=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/WxInfoController.java | 8 ++++---- .../iformall/service/impl/MallPermissionServiceImpl.java | 7 ++++++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java index c4679195f..e8e1a43ee 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java @@ -164,10 +164,10 @@ public class WxInfoController extends BaseController { WxBuser oldUser = null; if (boolHaveUnionId) { // 优先根据unionId查询 - WxBuser userQ = new WxBuser(); - userQ.updateTenantInfo(wxAuthorizerInfo); - userQ.setUnionId(unionId); - oldUser = wxBuserService.getByObject(userQ); +// WxBuser userQ = new WxBuser(); +// userQ.updateTenantInfo(wxAuthorizerInfo); +// userQ.setUnionId(unionId); +// oldUser = wxBuserService.getByObject(userQ); } if (oldUser == null) { oldUser = wxBuserService.getByOpenId(newUser); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java index 7fa6689b7..2033feb00 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java @@ -140,7 +140,12 @@ public class MallPermissionServiceImpl implements MallPermissionService { }}; String menus = wxMallMapper.queryMenusByTenantInfo(q); JSONArray menuIdList = JSON.parseArray(menus); - return getAllMenuListByParentId(0L, menuIdList.toJavaList(Long.class), boolNav); + if (null != menuIdList) { + return getAllMenuListByParentId(0L, menuIdList.toJavaList(Long.class), boolNav); + }else { + return null; + } + } else { //用户菜单列表 List menuIdList = mallUserInfoMapper.queryAllMenuId(userInfo.getId());