Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
youjj
cloud-platform
Commits
8b78a345
Commit
8b78a345
authored
Dec 11, 2019
by
libin
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'luck_draw_feature' into dev
parents
a4373f02
b5d5672c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
ActivityPopupBiz.java
...java/com/xxfc/platform/activity/biz/ActivityPopupBiz.java
+1
-1
No files found.
xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityPopupBiz.java
View file @
8b78a345
...
@@ -71,7 +71,7 @@ public class ActivityPopupBiz extends BaseBiz<ActivityPopupMapper, ActivityPopup
...
@@ -71,7 +71,7 @@ public class ActivityPopupBiz extends BaseBiz<ActivityPopupMapper, ActivityPopup
/*if (popupIdSet.add(activityPopup.getId())) {*/
/*if (popupIdSet.add(activityPopup.getId())) {*/
boolean
flag
=
activityPopularizeUserMap
.
isEmpty
()
||
boolean
flag
=
activityPopularizeUserMap
.
isEmpty
()
||
activityPopularizeUserMap
.
get
(
activityPopup
.
getActivityId
())
==
null
||
activityPopularizeUserMap
.
get
(
activityPopup
.
getActivityId
())
==
null
||
activityPopularizeUserMap
.
get
(
activityPopup
.
getActivityId
()
.
equals
(
Boolean
.
FALSE
)
);
activityPopularizeUserMap
.
get
(
activityPopup
.
getActivityId
()
).
equals
(
Boolean
.
FALSE
);
if
(
flag
)
{
if
(
flag
)
{
result
.
add
(
activityPopup
);
result
.
add
(
activityPopup
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment