修改活动选中

src/main/java/org/springblade/sing/goods/controller/ActiveIdAndGoodsIdController.java

@@ -76,7 +76,10 @@ public class ActiveIdAndGoodsIdController extends BladeController {
 	@ApiOperation(value = "分页", notes = "传入activeIdAndGoodsId")
 	public R<IPage<ActiveIdAndGoodsIdVO>> list(ActiveIdAndGoodsId activeIdAndGoodsId, Query query, String ids) {
 		QueryWrapper<ActiveIdAndGoodsId> queryWrapper = Condition.getQueryWrapper(activeIdAndGoodsId);
-		queryWrapper.lambda().in(ObjectUtils.isNotEmpty(activeIdAndGoodsId.getActiveId()), ActiveIdAndGoodsId::getGoodsId, Func.toLongList(ids));
+		queryWrapper.lambda().in(ObjectUtils.isNotEmpty(activeIdAndGoodsId.getActiveId()) && StringUtils.isNotEmpty(ids),
+			ActiveIdAndGoodsId::getGoodsId, Func.toLongList(ids));
+		queryWrapper.lambda().in(ObjectUtils.isNotEmpty(activeIdAndGoodsId.getGoodsId()) && StringUtils.isNotEmpty(ids),
+			ActiveIdAndGoodsId::getActiveId, Func.toLongList(ids));
 		IPage<ActiveIdAndGoodsId> pages = activeIdAndGoodsIdService.page(Condition.getPage(query), queryWrapper);
 		return R.data(ActiveIdAndGoodsIdWrapper.build().pageVO(pages));
 	}

src/main/java/org/springblade/sing/goods/entity/ActiveIdAndGoodsId.java

@@ -37,7 +37,10 @@ public class ActiveIdAndGoodsId extends BaseEntity {
 
 	private static final long serialVersionUID = 1L;
 
+	@ApiModelProperty("活动ID")
 	private Long activeId;
+
+	@ApiModelProperty("商品ID")
 	private Long goodsId;