修改用户列表查询
This commit is contained in:
parent
d8b0f3a9ee
commit
676a4e8693
|
@ -14,7 +14,6 @@ import lombok.RequiredArgsConstructor;
|
|||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.dromara.common.core.constant.CacheNames;
|
||||
import org.dromara.common.core.constant.UserConstants;
|
||||
import org.dromara.common.core.enums.UserType;
|
||||
import org.dromara.common.core.exception.ServiceException;
|
||||
import org.dromara.common.core.service.UserService;
|
||||
import org.dromara.common.core.utils.MapstructUtils;
|
||||
|
@ -63,7 +62,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
|
|||
|
||||
@Override
|
||||
public TableDataInfo<SysUserVo> selectPageUserList(SysUserBo user, PageQuery pageQuery) {
|
||||
user.setUserType(UserType.STUDENT.getUserType());
|
||||
//user.setUserType(UserType.STUDENT.getUserType());
|
||||
Page<SysUserVo> page = baseMapper.selectPageUserList(pageQuery.build(), this.buildQueryWrapper(user));
|
||||
return TableDataInfo.build(page);
|
||||
}
|
||||
|
@ -83,6 +82,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
|
|||
Map<String, Object> params = user.getParams();
|
||||
QueryWrapper<SysUser> wrapper = Wrappers.query();
|
||||
wrapper.eq("u.del_flag", UserConstants.USER_NORMAL)
|
||||
.eq(StringUtils.isNotBlank(user.getUserType()), "u.user_type", user.getUserType())
|
||||
.eq(ObjectUtil.isNotNull(user.getUserId()), "u.user_id", user.getUserId())
|
||||
.like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName())
|
||||
.eq(StringUtils.isNotBlank(user.getStatus()), "u.status", user.getStatus())
|
||||
|
|
Loading…
Reference in New Issue