|
@@ -83,7 +83,7 @@ public class PayBoxServiceImpl extends ServiceImpl<PayBoxMapper, PayBox> impleme
|
|
|
return page(param.toPage(), new LambdaQueryWrapper<PayBox>()
|
|
|
.like(Strings.isNotBlank(param.getName()), PayBox::getName, param.getName())
|
|
|
.in(CollectionUtils.isNotEmpty(payApplicationAppIdList), PayBox::getAppId, payApplicationAppIdList)
|
|
|
- .apply(Strings.isNotBlank(merchantIds), "FIND_IN_SET ('" + merchantIds + "',merchant_ids)")
|
|
|
+ .apply(Strings.isNotBlank(merchantIds), "FIND_IN_SET ('" + merchantIds + "',merchant_nos)")
|
|
|
.orderByDesc(PayBox::getCreateTime))
|
|
|
.convert(payBox -> this.toVo(payBox, finalPayApplicationMap, finalPayMerchantMap));
|
|
|
}
|