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 b8d86770f..5b0d68812 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()); diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index a2030f274..8cf6cd399 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -521,11 +521,11 @@