From bdb4a481d7ab7085a0832a7f1c0f5295596d498c Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期二, 08 十一月 2022 18:09:23 +0800
Subject: [PATCH] 图片管理和视频管理
---
ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
index 7664f29..53c1bc8 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
@@ -4,7 +4,6 @@
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.bo.AdminUserDetails;
@@ -183,7 +182,7 @@
token = jwtTokenUtil.generateToken(userDetails.getUserId(), userDetails.getUsername());
redisService.set(RedisKey.PLATFORM_TOKEN_KEY.concat(username), token, LiveTimeMillisecond.s7200.time);
// updateLoginTimeByUsername(username);
- insertLoginLog(username);
+ //insertLoginLog(username);
} catch (AuthenticationException e) {
LOGGER.warn("鐧诲綍寮傚父:{}", e.getMessage());
}
@@ -342,7 +341,7 @@
}
@Override
- public IPage<UmsAdmin> pageUser(UserVO.PageUserVO pageUserVO) {
+ public Page<UmsAdmin> pageUser(UserVO.PageUserVO pageUserVO) {
int pageSize = pageUserVO.getPageSize();
int current = pageUserVO.getCurrent();
Page<UmsAdmin> page = new Page<>(current, pageSize);
@@ -359,7 +358,17 @@
if (PojoUtils.Vo.isUsefulSearchParam(pageUserVO.getUserType())) {
queryWrapper.eq(UmsAdmin::getUserType, pageUserVO.getUserType());
}*/
- Page<UmsAdmin> page1 = baseMapper.selectCondPage(page,pageUserVO);
+ UmsAdmin umsAdmin = new UmsAdmin();
+ if (pageUserVO.getUserType()!=null) {
+ umsAdmin.setUserType(pageUserVO.getUserType());
+ }
+ if (pageUserVO.getKeyword()!=null&&!("".equals(pageUserVO.getKeyword()))) {
+ umsAdmin.setKeyword(pageUserVO.getKeyword());
+ }
+ if (pageUserVO.getJobTitle()!=null&&!("".equals(pageUserVO.getJobTitle()))) {
+ umsAdmin.setJobTitle(pageUserVO.getJobTitle());
+ }
+ Page<UmsAdmin> page1 = baseMapper.selectCondPage(page,umsAdmin);
return page1;
}
--
Gitblit v1.8.0