``` refactor(service): 在设置活动类别名称前增加非空检查在AdminHappyActivityServiceImpl.java中...

Administrator

10 hours ago ccbd86bc5f747b748b5bde257a789d748b8cefbb

 src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java

@@ -159,7 +159,11 @@
                Map<Long, HappyActivityCategory> categoryMap = happyActivityCategories.stream().collect(Collectors.toMap(HappyActivityCategory::getId, happyActivityCategory -> happyActivityCategory));

                for (HappyActivity happyActivity : records){
                    happyActivity.setCategoryName(categoryMap.get(happyActivity.getCategoryId()).getName());
                    if(ObjectUtil.isNotNull(happyActivity.getCategoryId())
                        && categoryMap.containsKey(happyActivity.getCategoryId())
                    ){
                        happyActivity.setCategoryName(categoryMap.get(happyActivity.getCategoryId()).getName());
                    }
                }
            }
        }