“djh”
5 days ago d30017df796e4e4aef20f320f3c27d90ba8cbeff
hazmat-framework/src/main/java/com/gkhy/hazmat/framework/web/service/UserDetailServiceImpl.java
@@ -61,20 +61,23 @@
        Set<String> roleKeys = permissionService.getRolePermission(user);
        Set<String> permKeys = permissionService.getMenuPermission(user);
        List<GrantedAuthority> authorities = new ArrayList<>();
//        List<GrantedAuthority> authorities = new ArrayList<>();
//        for (String perm : permKeys) {
//            authorities.add(new SimpleGrantedAuthority(perm));
//        }
        List<GrantedAuthority> authorities=new ArrayList<>();
        for (String perm : permKeys) {
            authorities.add(new SimpleGrantedAuthority(perm));
        }
//        List<GrantedAuthority> authorities=new ArrayList<>();
//        if(UserTypeEnum.SYSTEM_USER.getCode().equals(user.getUserType())) {
//            authorities.add(new SimpleGrantedAuthority("hazmat:manage:system"));
//        }else if(UserTypeEnum.COMPANY_USER.getCode().equals(user.getUserType())){
//            authorities.add(new SimpleGrantedAuthority("hazmat:manage:company"));
//        }else if(UserTypeEnum.NORMAL_USER.getCode().equals(user.getUserType())){
//            authorities.add(new SimpleGrantedAuthority("hazmat:manage:common"));
//        }else if (UserTypeEnum.CHECK_USER.getCode().equals(user.getUserType())){
//            authorities.add(new SimpleGrantedAuthority("hazmat:manage:system"));
//        }
        if(UserTypeEnum.SYSTEM_USER.getCode().equals(user.getUserType())) {
            authorities.add(new SimpleGrantedAuthority("hazmat:manage:system"));
        }else if(UserTypeEnum.COMPANY_USER.getCode().equals(user.getUserType())){
            authorities.add(new SimpleGrantedAuthority("hazmat:manage:company"));
        }else if(UserTypeEnum.NORMAL_USER.getCode().equals(user.getUserType())){
            authorities.add(new SimpleGrantedAuthority("hazmat:manage:common"));
        }else if (UserTypeEnum.CHECK_USER.getCode().equals(user.getUserType())){
            authorities.add(new SimpleGrantedAuthority("hazmat:manage:system"));
        }
        return new LoginUserDetails(user,authorities,roleKeys,permKeys);
    }
}