查询user分页

src/main/java/com/sfa/system/domain/dao/impl/SysUserDaoImpl.java

@@ -551,8 +551,9 @@ public class SysUserDaoImpl implements ISysUserDao {
 
     @Override
     public PageInfo selectUserPage(SysUserWq sysUserWq) {
-        LambdaQueryWrapper<SysUser> qw = buildWrapper(sysUserWq);
-        Page<SysUser> pageR = userMapper.selectPage(TableSupport.pageI(), qw);
+//        LambdaQueryWrapper<SysUser> qw = buildWrapper(sysUserWq);
+//        Page<SysUser> pageR = userMapper.selectPage(TableSupport.pageI(), qw);
+        Page<SysUser> pageR = userMapper.selectUserPage(TableSupport.pageI(), sysUserWq);
         PageInfo<SysUser> pageInfo = new PageInfo<>(pageR);
         return pageInfo;
     }
@@ -570,18 +571,21 @@ public class SysUserDaoImpl implements ISysUserDao {
         if (Objects.nonNull(sysUserWq.getDeptId())) {
             qw.eq(SysUser::getDeptId, sysUserWq.getDeptId());
         }
-        if (Objects.nonNull(sysUserWq.getBeginTime())&&Objects.nonNull(sysUserWq.getEndTime())){
-            qw.between(SysUser::getCreateTime, sysUserWq.getBeginTime(),sysUserWq.getEndTime());
-        }
         if (Objects.nonNull(sysUserWq.getExistRole()) && !sysUserWq.getExistRole()){
             qw.isNull(SysUser::getRoleId);
         }
+        if (StringUtils.isNotBlank(sysUserWq.getNickNameLike())) {
+            qw.like(SysUser::getNickName, sysUserWq.getNickNameLike());
+        }
         if (StringUtils.isNotBlank(sysUserWq.getUserNameLike())) {
             qw.like(SysUser::getUserName, sysUserWq.getUserNameLike());
         }
         if (StringUtils.isNotBlank(sysUserWq.getPhonenumberLike())) {
             qw.like(SysUser::getPhonenumber, sysUserWq.getPhonenumberLike());
         }
+        if (Objects.nonNull(sysUserWq.getBeginTime())&&Objects.nonNull(sysUserWq.getEndTime())){
+            qw.between(SysUser::getCreateTime, sysUserWq.getBeginTime(),sysUserWq.getEndTime());
+        }
         return qw;
     }
 }

src/main/java/com/sfa/system/domain/mapper/SysUserMapper.java

@@ -3,6 +3,8 @@ package com.sfa.system.domain.mapper;
 import java.util.List;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sfa.system.domain.wq.SysUserWq;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import com.sfa.system.api.domain.SysUser;
@@ -131,9 +133,11 @@ public interface SysUserMapper extends BaseMapper<SysUser>
      */
     public SysUser checkEmailUnique(String email);
 
-    List<SysUser> selectUserPage();
+//    List<SysUser> selectUserPage();
 
     void updateUserPostByPostId(@Param("postId") Long postId, @Param("postName") String postName, @Param("ruleId") Long ruleId, @Param("ruleName") String ruleName);
 
     int updateRoleName(SysUser user);
+
+    Page<SysUser> selectUserPage(Page<SysUser> page, @Param("sysUserWq") SysUserWq sysUserWq);
 }

src/main/java/com/sfa/system/domain/wq/SysUserWq.java

@@ -18,6 +18,7 @@ public class SysUserWq {
     private String phonenumber;
 
     private String userNameLike;
+    private String nickNameLike;
 
     private String phonenumberLike;
 

src/main/java/com/sfa/system/service/query/impl/UserQueryServiceImpl.java

@@ -33,6 +33,7 @@ public class UserQueryServiceImpl implements IUserQueryService {
         SysUserWq sysUserWq = new SysUserWq();
         BeanUtils.copyProperties(userVo,sysUserWq);
         sysUserWq.setUserNameLike(userVo.getUserName())
+                .setNickNameLike(userVo.getNickName())
                 .setPhonenumberLike(userVo.getPhonenumber());
 
         return userDao.selectUserPage(sysUserWq);

src/main/resources/mapper/system/SysUserMapper.xml

@@ -223,27 +223,51 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
 
-	<select id="selectUserPage" parameterType="com.sfa.system.api.domain.SysUser" resultMap="SysUserResult">
-		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status,
-		u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,u.post_id,u.post_name,u.rule_id,u.rule_name, d.dept_name, d.leader from sys_user
-		u
-		left join sys_dept d on u.dept_id = d.dept_id
-		where u.del_flag = '0'
-		<if test="userId != null and userId != 0">
-			AND u.user_id = #{userId}
+<!--	<select id="selectUserPage" parameterType="com.sfa.system.api.domain.SysUser" resultMap="SysUserResult">-->
+<!--		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status,-->
+<!--		u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,u.post_id,u.post_name,u.rule_id,u.rule_name, d.dept_name, d.leader from sys_user-->
+<!--		u-->
+<!--		left join sys_dept d on u.dept_id = d.dept_id-->
+<!--		where u.del_flag = '0'-->
+<!--		<if test="userId != null and userId != 0">-->
+<!--			AND u.user_id = #{userId}-->
+<!--		</if>-->
+<!--		<if test="userName != null and userName != ''">-->
+<!--			AND u.user_name like concat('%', #{userName}, '%')-->
+<!--		</if>-->
+<!--		<if test="status != null and status != ''">-->
+<!--			AND u.status = #{status}-->
+<!--		</if>-->
+<!--		<if test="phonenumber != null and phonenumber != ''">-->
+<!--			AND u.phonenumber like concat('%', #{phonenumber}, '%')-->
+<!--		</if>-->
+<!--		<if test="deptId != null and deptId != 0">-->
+<!--			AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId},-->
+<!--			ancestors) ))-->
+<!--		</if>-->
+<!--	</select>-->
+
+
+	<select id="selectUserPage" resultType="com.sfa.system.api.domain.SysUser">
+		select *
+		from sys_user where del_flag = '0'
+		<if test="sysUserWq.status != null and sysUserWq.status != ''">
+			and status = #{sysUserWq.status}
 		</if>
-		<if test="userName != null and userName != ''">
-			AND u.user_name like concat('%', #{userName}, '%')
+		<if test="sysUserWq.deptId != null">
+			and dept_id = #{sysUserWq.deptId}
 		</if>
-		<if test="status != null and status != ''">
-			AND u.status = #{status}
+		<if test="sysUserWq.nickNameLike != null and sysUserWq.nickNameLike != ''">
+			and nick_name like concat('%',#{sysUserWq.nickNameLike},'%')
 		</if>
-		<if test="phonenumber != null and phonenumber != ''">
-			AND u.phonenumber like concat('%', #{phonenumber}, '%')
+		<if test="sysUserWq.userNameLike != null and sysUserWq.userNameLike != ''">
+			and user_name like concat('%',#{sysUserWq.userNameLike},'%')
 		</if>
-		<if test="deptId != null and deptId != 0">
-			AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId},
-			ancestors) ))
+		<if test="sysUserWq.phonenumberLike != null and sysUserWq.phonenumberLike != ''">
+			and phonenumber like concat('%',#{sysUserWq.phonenumberLike},'%')
+		</if>
+		<if test="sysUserWq.beginTime != null and sysUserWq.endTime != null">
+			AND create_time BETWEEN #{sysUserWq.beginTime} AND #{sysUserWq.endTime}
 		</if>
 	</select>