Browse Source

B端登陆用户重复bug

release_toaliyun_real
xiaohanzi 5 years ago
parent
commit
4097545ff5
2 changed files with 10 additions and 5 deletions
  1. +4
    -4
      mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java
  2. +6
    -1
      mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java

+ 4
- 4
mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java View File

@@ -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);


+ 6
- 1
mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java View File

@@ -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<Long> menuIdList = mallUserInfoMapper.queryAllMenuId(userInfo.getId());


Loading…
Cancel
Save