Merge remote-tracking branch 'origin/1.0.1' into 1.0.1

k94314517

2024-04-12 bba77182f3f07fc6faa9a6ab1df7efb2b649b995

 server/service/src/main/java/com/doumee/config/shiro/ShiroRealm.java

@@ -107,8 +107,7 @@
        List<SystemPermission> permissions =null;
        // 获取登录用户信息
         if(authenticationToken.getUserType() == 0){
             roles =   systemRoleService.findByUserId(user.getId());
             permissions =  systemPermissionService.findByUserId(user.getId());
            roles =   systemRoleService.findByUserId(user.getId());
            CompanyPermission c = new CompanyPermission();
            c.setUserId(user.getId());
            c.setIsdeleted(Constants.ZERO);
@@ -121,6 +120,7 @@
                    user.getCompanyIdList().add(cc.getCompanyId());
                }
            }
            permissions =  systemPermissionService.findByUserId(user.getId());
        }else{
            Company company = companyService.findById(user.getCompanyId());
            if(company == null){
@@ -141,7 +141,6 @@
            }
        }
        LoginUserInfo userInfo = LoginUserInfo.from(user, roles, permissions);

        // 验证用户
        return new SimpleAuthenticationInfo(userInfo, user.getPassword(), this.getName());
    }