|
@@ -140,7 +140,9 @@ public class ActiveIdAndGoodsIdController extends BladeController {
|
|
|
@ApiParam(value = "主键ids", required = true) @RequestParam String ids,
|
|
@ApiParam(value = "主键ids", required = true) @RequestParam String ids,
|
|
|
@ApiParam(value = "类型", required = true) @RequestParam String type) {
|
|
@ApiParam(value = "类型", required = true) @RequestParam String type) {
|
|
|
List<Long> longs = Func.toLongList(ids);
|
|
List<Long> longs = Func.toLongList(ids);
|
|
|
- List<ActiveIdAndGoodsId> collect = longs.stream().map(eleId -> new ActiveIdAndGoodsId() {{
|
|
|
|
|
|
|
+ List<ActiveIdAndGoodsId> collect = longs.stream().filter(eleId->{
|
|
|
|
|
+ return !Long.valueOf(0L).equals(eleId);
|
|
|
|
|
+ }).map(eleId -> new ActiveIdAndGoodsId() {{
|
|
|
if(StringUtils.equals(type, ActiveRecord.class.getSimpleName())){
|
|
if(StringUtils.equals(type, ActiveRecord.class.getSimpleName())){
|
|
|
setActiveId(id);
|
|
setActiveId(id);
|
|
|
setGoodsId(eleId);
|
|
setGoodsId(eleId);
|
|
@@ -149,7 +151,8 @@ public class ActiveIdAndGoodsIdController extends BladeController {
|
|
|
setActiveId(eleId);
|
|
setActiveId(eleId);
|
|
|
}
|
|
}
|
|
|
}}).collect(Collectors.toList());
|
|
}}).collect(Collectors.toList());
|
|
|
- return R.status(deletePointGoodsAndActiveId(id, type) && activeIdAndGoodsIdService.saveBatch(collect));
|
|
|
|
|
|
|
+ deletePointGoodsAndActiveId(id, type);
|
|
|
|
|
+ return R.status(activeIdAndGoodsIdService.saveBatch(collect));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|