From 1b0cf0db5c82ea8308d2f338973a91555787c34d Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期二, 18 三月 2025 11:17:23 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- server/services/src/main/java/com/doumee/service/business/impl/RefundServiceImpl.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/server/services/src/main/java/com/doumee/service/business/impl/RefundServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/RefundServiceImpl.java index c4dfad8..8fac0ca 100644 --- a/server/services/src/main/java/com/doumee/service/business/impl/RefundServiceImpl.java +++ b/server/services/src/main/java/com/doumee/service/business/impl/RefundServiceImpl.java @@ -106,7 +106,7 @@ pageWrap.getModel().setStatus(Constants.TWO); IPage<Goodsorder> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity()); MPJLambdaWrapper<Refund> queryWrapper = initQueryParamByModel(pageWrap.getModel()); - queryWrapper.eq(StringUtils.isNotBlank(pageWrap.getModel().getCreatorName()) + queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCreatorName()) ,SystemUser::getRealname ,pageWrap.getModel().getCreatorName()); IPage<Refund> refundIPage = refundJoinMapper.selectJoinPage(page, Refund.class, queryWrapper); @@ -175,6 +175,7 @@ queryWrapper.like(model.getPayOnlineOrderid() !=null,Goodsorder::getOnlineOrderid,model.getPayOnlineOrderid()); queryWrapper.like(model.getOnlineOrderid() !=null,Refund::getOnlineOrderid,model.getOnlineOrderid()); queryWrapper.like(model.getOpenid() !=null,Member::getOpenid,model.getOpenid()); + queryWrapper.like(model.getCreatorName() !=null,SystemUser::getRealname,model.getCreatorName()); queryWrapper.eq(Goodsorder::getIsdeleted,Constants.ZERO); queryWrapper.orderByDesc(Refund::getDoneDate); return queryWrapper; -- Gitblit v1.9.3