Merge branch 'master-new-activity' into dev

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/ActivityPopularizeController.java

@@ -119,6 +119,7 @@ public class ActivityPopularizeController extends BaseController<ActivityPopular
                                 itemVO.setStatus(SYS_TRUE);
                             }
                         }
+                        if (null != appUserDTO) {
                             ActivityPopularizeLog activityPopularizeLog = popularizeLogBiz.selectByUserIdAndPopularIdAndItemId(new ActivityPopularizeLog(){{
                                 setUserId(appUserDTO.getUserid());
                                 setPopularizeId(v.getId());
@@ -127,6 +128,7 @@ public class ActivityPopularizeController extends BaseController<ActivityPopular
                             if (activityPopularizeLog != null) {
                                 itemVO.setStatus(activityPopularizeLog.getStatus());
                             }
+                        }
                         return itemVO;
                     }).collect(Collectors.toList()));
             return vo;