zhanghua
2022-11-28 a4047b6048ebfe09e66a765b58ea12b5bd0e2e6e
ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
@@ -4,13 +4,11 @@
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;
import com.ycl.dto.UmsAdminParam;
import com.ycl.dto.UpdateAdminPasswordParam;
import com.ycl.entity.depart.UmsDepart;
import com.ycl.entity.user.*;
import com.ycl.exception.ApiException;
import com.ycl.exception.Asserts;
@@ -80,8 +78,6 @@
    AdminMenuRelationMapper adminMenuRelationMapper;
    @Resource
    UmsMenuMapper umsMenuMapper;
    @Resource
    UmsAdminMapper umsAdminMapper;
    @Override
    public UmsAdmin getAdminByUsername(String username) {
@@ -186,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());
        }
@@ -349,7 +345,32 @@
        int pageSize = pageUserVO.getPageSize();
        int current = pageUserVO.getCurrent();
        Page<UmsAdmin> page = new Page<>(current, pageSize);
        return umsAdminMapper.selectPageByWordKey(page,pageUserVO.getKeyword());
       /* LambdaQueryWrapper<UmsAdmin> queryWrapper = new LambdaQueryWrapper<>();
        if (StringUtils.isNotBlank(pageUserVO.getKeyword())) {
            queryWrapper.like(UmsAdmin::getUsername, pageUserVO.getKeyword())
                    .or().like(UmsAdmin::getNickName, pageUserVO.getKeyword())
                    .or().like(UmsAdmin::getMobile, pageUserVO.getKeyword());
        }
        if (StringUtils.isNotBlank(pageUserVO.getJobTitle())) {
            queryWrapper.eq(UmsAdmin::getJobTitle, pageUserVO.getJobTitle());
        }
        if (PojoUtils.Vo.isUsefulSearchParam(pageUserVO.getUserType())) {
            queryWrapper.eq(UmsAdmin::getUserType, pageUserVO.getUserType());
        }*/
        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;
    }
    @Override