diff --git a/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java b/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java index 260e1b34..a9060da4 100644 --- a/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java @@ -276,7 +276,7 @@ public class ConnectServiceImpl extends ServiceImpl impl if(member==null){ LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); //使用UnionId登录 - if (StrUtil.isNotBlank(authUser.getToken().getUnionId())) { + if (authUser.getToken() != null && StrUtil.isNotBlank(authUser.getToken().getUnionId())) { queryWrapper.eq(Connect::getUnionId, authUser.getToken().getUnionId()) .eq(Connect::getUnionType, authUser.getSource()); } else { diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryServiceImpl.java index 1095544a..a14d773d 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryServiceImpl.java @@ -106,10 +106,10 @@ public class CategoryServiceImpl extends ServiceImpl i @Override public List categoryTree() { - List categoryVOList = (List) cache.get(CachePrefix.CATEGORY.getPrefix()); - if (categoryVOList != null) { - return categoryVOList; - } +// List categoryVOList = (List) cache.get(CachePrefix.CATEGORY.getPrefix()); +// if (categoryVOList != null) { +// return categoryVOList; +// } //获取全部分类 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); @@ -117,7 +117,7 @@ public class CategoryServiceImpl extends ServiceImpl i List list = this.list(queryWrapper); //构造分类树 - categoryVOList = new ArrayList<>(); + List categoryVOList = new ArrayList<>(); for (Category category : list) { if ("0".equals(category.getParentId())) { CategoryVO categoryVO = new CategoryVO(category);