diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/CompanyServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/CompanyServiceImpl.java index c79d06b..1efaad8 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/CompanyServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/CompanyServiceImpl.java @@ -61,8 +61,22 @@ public class CompanyServiceImpl extends ServiceImpl impl public Company selectCompanyByCompanyId(Long companyId) { Company company = companyMapper.selectById(companyId); - if(SiteSecurityUtils.isLogin()){ - Long l = companyCollectionMapper.selectCount(Wrappers.lambdaQuery().eq(CompanyCollection::getCompanyId, companyId).eq(CompanyCollection::getUserId, SiteSecurityUtils.getUserId())); + Long userId=null; + try { + LoginUser loginUser = SecurityUtils.getLoginUser(); + userId = loginUser.getUserId(); + }catch (Exception ignored){ + try { + LoginSiteUser siteUser = SiteSecurityUtils.getLoginSiteUser(); + userId = siteUser.getUserId(); + } catch (Exception ignored2) { + } + } + + if (userId == null) { + company.setIsCollection(0); + } else { + Long l = companyCollectionMapper.selectCount(Wrappers.lambdaQuery().eq(CompanyCollection::getCompanyId, companyId).eq(CompanyCollection::getUserId, userId)); company.setIsCollection(l>0?1:0); }