From cf566cbe51e917833f3e4e9820b8656b9c7c6a7c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 11 Jul 2022 11:21:30 +0800
Subject: [PATCH] fix
---
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/UserServiceImpl.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/UserServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/UserServiceImpl.java
index ffe82d9..9926a42 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/UserServiceImpl.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/UserServiceImpl.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.core.toolkit.StringPool;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xcong.farmer.cms.common.contants.AppContants;
import com.xcong.farmer.cms.common.response.Result;
import com.xcong.farmer.cms.modules.system.dto.*;
import com.xcong.farmer.cms.modules.system.entity.*;
@@ -13,7 +14,9 @@
import com.xcong.farmer.cms.modules.system.service.IUserService;
import com.xcong.farmer.cms.modules.system.util.LoginUserUtil;
import com.xcong.farmer.cms.modules.system.vo.*;
+import com.xcong.farmer.cms.utils.RedisUtils;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Service;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.util.ObjectUtil;
@@ -43,6 +46,8 @@
private MessageBoardMapper messageBoardMapper;
@Resource
private MenuMapper menuMapper;
+ @Resource
+ private RedisUtils redisUtils;
@Override
public Result getUserInPage(AdminUserDto adminUserDto) {
@@ -52,9 +57,9 @@
long companyId = userlogin.getCompanyId() == null ? UserEntity.USER_BELONG_TOP : userlogin.getCompanyId();
if(companyId > UserEntity.USER_BELONG_TOP){
userEntity.setCompanyId(companyId);
- userEntity.setRoleName(RoleEntity.ROLE_ADMIN_NAME);
+ userEntity.setRoleId(RoleEntity.ROLE_ADMIN_NAME_ID);
}else if(companyId == UserEntity.USER_BELONG_TOP){
- userEntity.setRoleName(RoleEntity.ROLE_SUPER_NAME);
+ userEntity.setRoleId(RoleEntity.ROLE_SUPER_NAME_ID);
}
if(StrUtil.isNotEmpty(adminUserDto.getUsername())){
userEntity.setUsername(adminUserDto.getUsername());
@@ -350,6 +355,11 @@
userRoleMapper.delete(objectQueryWrapper);
this.baseMapper.deleteById(userId);
+
+ String redisMember = AppContants.APP_LOGIN_PREFIX + userId;
+ String token = redisUtils.getString(redisMember);
+ redisUtils.del(AppContants.APP_LOGIN_PREFIX + token);
+ SecurityContextHolder.clearContext();
}
}
@@ -424,6 +434,7 @@
QueryWrapper<ArticleEntity> articleQueryWrapper = new QueryWrapper<>();
articleQueryWrapper.eq("company_id",companyId);
+ articleQueryWrapper.eq("del_status",ArticleEntity.DELETE_STATUS_NO);
adminHomePageInfoVo.setArticleNum(articleMapper.selectCount(articleQueryWrapper));
QueryWrapper<MessageBoardEntity> messageQueryWrapper = new QueryWrapper<>();
--
Gitblit v1.9.1