功能完善

liuhaonan

2022-02-24 34ee53680318cef28c80cf40959b6fd3d55a0c4e

功能完善

 sandu-common/src/main/java/com/sandu/common/security/LoginUserInfo.java

@@ -2,12 +2,14 @@

import cn.hutool.core.util.StrUtil;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.google.common.collect.Lists;
import com.sandu.common.enums.AdminStatusStatus;
import lombok.Data;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.core.userdetails.UserDetails;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.stream.Collectors;
@@ -43,7 +45,7 @@
    @Override
    public Collection<? extends GrantedAuthority> getAuthorities() {
        if (StrUtil.isBlank(permission)) {
            return null;
            return Lists.newArrayList();
        }
        return Arrays.stream(permission.split(","))
                .map(SimpleGrantedAuthority::new)

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java

@@ -95,7 +95,7 @@
            throw new BusinessException("编辑管理员失败");
        }

        adminRoleRelationService.remove(Wrappers.lambdaQuery(AdminRoleRelation.class).eq(AdminRoleRelation::getAdminId,admin));
        adminRoleRelationService.remove(Wrappers.lambdaQuery(AdminRoleRelation.class).eq(AdminRoleRelation::getAdminId,admin.getId()));
        AdminRoleRelation adminRoleRelation = new AdminRoleRelation();
        adminRoleRelation.setAdminId(adminId);
        adminRoleRelation.setRoleId(param.getRoleId());