|
|
@@ -129,8 +129,8 @@ public class AppMallController {
|
|
|
@ApiOperation(value = "商场获取商店列表", notes = "传入商场")
|
|
|
public R<IPage<Shop>> getShopList( ShopDTO shopDTO,Query query) {
|
|
|
Assert.notNull(shopDTO.getMallId(), "商场id不能为空");
|
|
|
- IPage<Shop> shops = shopService.getBaseMapper().selectPage(Condition.getPage(query),new QueryWrapper<>(new Shop()).lambda().eq(Shop::getAuditStatus, shopDTO.getAuditStatus())
|
|
|
- .eq(Shop::getMallId, shopDTO.getMallId()).like(shopDTO.getLabelId() != null, Shop::getLabelIds, shopDTO.getLabelId())
|
|
|
+ IPage<Shop> shops = shopService.getBaseMapper().selectPage(Condition.getPage(query),new QueryWrapper<>(new Shop()).lambda().eq(shopDTO.getAuditStatus() != null,Shop::getAuditStatus, shopDTO.getAuditStatus())
|
|
|
+ .eq(shopDTO.getMallId() != null,Shop::getMallId, shopDTO.getMallId()).like(shopDTO.getLabelId() != null, Shop::getLabelIds, shopDTO.getLabelId())
|
|
|
.eq(shopDTO.getMallAreaId() != null, Shop::getMallAreaId, shopDTO.getMallAreaId()));
|
|
|
|
|
|
|