Skip to content

C
cloud-platform
Commit cc8fc402 authored by jiaorz's avatar jiaorz
Browse files
Options

Merge branch 'master-new-activity' into dev

parents 63502aa7 3d89d275
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 7 deletions
xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/ActivityPopularizeController.java
View file @ cc8fc402
...@@ -119,13 +119,15 @@ public class ActivityPopularizeController extends BaseController<ActivityPopular ...@@ -119,13 +119,15 @@ public class ActivityPopularizeController extends BaseController<ActivityPopular
itemVO.setStatus(SYS_TRUE); itemVO.setStatus(SYS_TRUE);
} }
} }
ActivityPopularizeLog activityPopularizeLog = popularizeLogBiz.selectByUserIdAndPopularIdAndItemId(new ActivityPopularizeLog(){{ if (null != appUserDTO) {
setUserId(appUserDTO.getUserid()); ActivityPopularizeLog activityPopularizeLog = popularizeLogBiz.selectByUserIdAndPopularIdAndItemId(new ActivityPopularizeLog(){{
setPopularizeId(v.getId()); setUserId(appUserDTO.getUserid());
setItemId(item.getId()); setPopularizeId(v.getId());
}}); setItemId(item.getId());
if (activityPopularizeLog != null) { }});
itemVO.setStatus(activityPopularizeLog.getStatus()); if (activityPopularizeLog != null) {
itemVO.setStatus(activityPopularizeLog.getStatus());
}
} }
return itemVO; return itemVO;
}).collect(Collectors.toList())); }).collect(Collectors.toList()));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment