From d7e663d304a2ccb565a24362b116ddaa9da9941a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 09 一月 2024 13:56:43 +0800
Subject: [PATCH] 整理
---
server/dmvisit_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
index f4af23d..92c67c6 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
@@ -1,6 +1,5 @@
package com.doumee.service.system.impl;
-import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -206,24 +205,24 @@
@Override
- public PageData<SystemUser> findAllList(PageWrap<SystemUser> pageWrap) {
+ public List<SystemUser> findAllList(SystemUser pageWrap) {
- IPage<SystemUser> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+
MPJLambdaWrapper<SystemUser> queryWrapper = new MPJLambdaWrapper<>();
- Utils.MP.blankToNull(pageWrap.getModel());
+ Utils.MP.blankToNull(pageWrap);
queryWrapper.selectAll(SystemUser.class);
queryWrapper.eq(SystemUser::getDeleted, Constants.ZERO);
- queryWrapper.and(StringUtils.isNotBlank(pageWrap.getModel().getUsername()),ms->ms.like(SystemUser::getUsername,pageWrap.getModel().getUsername())
- .or().like(SystemUser::getMobile,pageWrap.getModel().getUsername())
- .or().like(SystemUser::getRealname,pageWrap.getModel().getUsername())
+ queryWrapper.and(StringUtils.isNotBlank(pageWrap.getUsername()),ms->ms.like(SystemUser::getUsername,pageWrap.getUsername())
+ .or().like(SystemUser::getMobile,pageWrap.getUsername())
+ .or().like(SystemUser::getRealname,pageWrap.getUsername())
);
queryWrapper.orderByDesc(SystemUser::getCreateTime);
- IPage<SystemUser> result = systemUserJoinMapper.selectJoinPage(page, SystemUser.class, queryWrapper);
+ List<SystemUser> result = systemUserJoinMapper.selectJoinList( SystemUser.class, queryWrapper);
- return PageData.from(result);
+ return result;
}
--
Gitblit v1.9.3