Merge branch 'luck_draw_feature' into dev

8b78a345 · libin · a4373f02 · b5d5672c · 8b78a345
Commit 8b78a345 authored Dec 11, 2019 by libin
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

ActivityPopupBiz.java ...java/com/xxfc/platform/activity/biz/ActivityPopupBiz.java +1 -1

No files found.
--- a/xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityPopupBiz.java
+++ b/xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityPopupBiz.java
@@ -71,7 +71,7 @@ public class ActivityPopupBiz extends BaseBiz<ActivityPopupMapper, ActivityPopup
                /*if (popupIdSet.add(activityPopup.getId())) {*/
                    boolean flag = activityPopularizeUserMap.isEmpty() ||
                            activityPopularizeUserMap.get(activityPopup.getActivityId()) == null ||
-                            activityPopularizeUserMap.get(activityPopup.getActivityId().equals(Boolean.FALSE));
+                            activityPopularizeUserMap.get(activityPopup.getActivityId()).equals(Boolean.FALSE);
                    if (flag) {
                        result.add(activityPopup);
                    }