Skip to content

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

Merge branch 'master-order' into dev

parents 19b032e1 d4f34f14
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityProductBiz.java
View file @ 3dc710e5
...@@ -48,8 +48,10 @@ public class ActivityProductBiz extends BaseBiz<ActivityProductMapper, ActivityP ...@@ -48,8 +48,10 @@ public class ActivityProductBiz extends BaseBiz<ActivityProductMapper, ActivityP
Example example = new Example(ActivityProduct.class); Example example = new Example(ActivityProduct.class);
example.createCriteria().andEqualTo("id", id).andEqualTo("isDel", false); example.createCriteria().andEqualTo("id", id).andEqualTo("isDel", false);
ActivityProduct activityProduct = mapper.selectOneByExample(example); ActivityProduct activityProduct = mapper.selectOneByExample(example);
List<ActivityProductSpecs> activityProductSpecs = activityProductSpecsBiz.getAllByActiveId(activityProduct.getId()); if(activityProduct != null) {
activityProduct.setList(activityProductSpecs); List<ActivityProductSpecs> activityProductSpecs = activityProductSpecsBiz.getAllByActiveId(activityProduct.getId());
activityProduct.setList(activityProductSpecs);
}
return activityProduct; return activityProduct;
} }
......
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