src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java
@@ -159,10 +159,14 @@ Map<Long, HappyActivityCategory> categoryMap = happyActivityCategories.stream().collect(Collectors.toMap(HappyActivityCategory::getId, happyActivityCategory -> happyActivityCategory)); for (HappyActivity happyActivity : records){ if(ObjectUtil.isNotNull(happyActivity.getCategoryId()) && categoryMap.containsKey(happyActivity.getCategoryId()) ){ happyActivity.setCategoryName(categoryMap.get(happyActivity.getCategoryId()).getName()); } } } } return voteActivityPage; }