Merge branch 'master-new-activity' into dev

cc8fc402 · jiaorz · 63502aa7 · 3d89d275 · cc8fc402
Commit cc8fc402 authored Dec 04, 2019 by jiaorz
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 7 deletions

ActivityPopularizeController.java .../platform/activity/rest/ActivityPopularizeController.java +9 -7

No files found.
--- a/xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/ActivityPopularizeController.java
+++ b/xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/ActivityPopularizeController.java
@@ -119,13 +119,15 @@ public class ActivityPopularizeController extends BaseController<ActivityPopular
                                itemVO.setStatus(SYS_TRUE);
                            }
                        }
-                        ActivityPopularizeLog activityPopularizeLog = popularizeLogBiz.selectByUserIdAndPopularIdAndItemId(new ActivityPopularizeLog(){{
-                            setUserId(appUserDTO.getUserid());
-                            setPopularizeId(v.getId());
-                            setItemId(item.getId());
-                        }});
-                        if (activityPopularizeLog != null) {
-                            itemVO.setStatus(activityPopularizeLog.getStatus());
+                        if (null != appUserDTO) {
+                            ActivityPopularizeLog activityPopularizeLog = popularizeLogBiz.selectByUserIdAndPopularIdAndItemId(new ActivityPopularizeLog(){{
+                                setUserId(appUserDTO.getUserid());
+                                setPopularizeId(v.getId());
+                                setItemId(item.getId());
+                            }});
+                            if (activityPopularizeLog != null) {
+                                itemVO.setStatus(activityPopularizeLog.getStatus());
+                            }
                        }
                        return itemVO;
                    }).collect(Collectors.toList()));