From b05fea19990632b2ec6320cbfaab2bddc87006c0 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 22 一月 2026 21:17:36 +0800
Subject: [PATCH] 经销商管理
---
server/dmmall_service/src/main/java/com/doumee/service/business/impl/UserActionServiceImpl.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/UserActionServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/UserActionServiceImpl.java
index 4ee7ed1..58dfdfc 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/UserActionServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/UserActionServiceImpl.java
@@ -113,34 +113,33 @@
QueryWrapper<UserAction> wrapper = new QueryWrapper<>(userAction);
return userActionMapper.selectOne(wrapper);
}
-
@Override
public List<UserAction> findList(UserAction userAction) {
QueryWrapper<UserAction> wrapper = new QueryWrapper<>(userAction);
return userActionMapper.selectList(wrapper);
}
-
@Override
public PageData<UserAction> findPage(PageWrap<UserAction> pageWrap) {
IPage<UserAction> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<UserAction> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
- UserAction queryModel = pageWrap.getModel();
+ UserAction queryModel = pageWrap.getModel();
queryWrapper.selectAll(UserAction.class)
- .leftJoin(Member.class,Member::getId,UserAction::getMemberId)
+// .leftJoin(Member.class,Member::getId,UserAction::getMemberId)
.leftJoin(SystemUser.class,SystemUser::getId,UserAction::getCreator)
.selectAs(SystemUser::getRealname,UserAction::getCreateName)
- .selectAs(Member::getName,UserAction::getMemberName)
- .selectAs(Member::getPhone,UserAction::getMobile)
+// .selectAs(Member::getName,UserAction::getMemberName)
+// .selectAs(Member::getPhone,UserAction::getMobile)
.like(StringUtils.isNotBlank(queryModel.getCreateName()),SystemUser::getRealname,queryModel.getCreateName())
.like(StringUtils.isNotBlank(queryModel.getMemberName()),Member::getName,queryModel.getMemberName())
.like(StringUtils.isNotBlank(queryModel.getMobile()),Member::getPhone,queryModel.getMobile())
.like(StringUtils.isNotBlank(queryModel.getRemark()),Member::getPhone,queryModel.getRemark())
.eq(!Objects.isNull(queryModel.getMemberType()),Member::getType,queryModel.getMemberType())
.eq(!Objects.isNull(queryModel.getBeforeStatus()),UserAction::getBeforeStatus,queryModel.getBeforeStatus())
+ .eq(!Objects.isNull(queryModel.getMemberId()),UserAction::getMemberId,queryModel.getMemberId())
.eq(!Objects.isNull(queryModel.getType()),UserAction::getType,queryModel.getType())
- .orderByDesc(UserAction::getCreateDate)
- ;
+ .eq(!Objects.isNull(queryModel.getId()),UserAction::getId,queryModel.getId())
+ .orderByDesc(UserAction::getCreateDate);
IPage<UserAction> result = userActionMapper.selectJoinPage(page,UserAction.class,queryWrapper);
if(result!=null &&result.getRecords()!=null){
for(UserAction model :result.getRecords()){
--
Gitblit v1.9.3