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 f694c8d..c79d06b 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,17 +61,11 @@ public class CompanyServiceImpl extends ServiceImpl impl public Company selectCompanyByCompanyId(Long companyId) { Company company = companyMapper.selectById(companyId); - Long userId=null; - try { - LoginUser loginUser = SecurityUtils.getLoginUser(); - userId = loginUser.getUserId(); - }catch (Exception ignored){ - LoginSiteUser siteUser = SiteSecurityUtils.getLoginSiteUser(); - userId = siteUser.getUserId(); + if(SiteSecurityUtils.isLogin()){ + Long l = companyCollectionMapper.selectCount(Wrappers.lambdaQuery().eq(CompanyCollection::getCompanyId, companyId).eq(CompanyCollection::getUserId, SiteSecurityUtils.getUserId())); + company.setIsCollection(l>0?1:0); } - //收藏 - Long l = companyCollectionMapper.selectCount(Wrappers.lambdaQuery().eq(CompanyCollection::getCompanyId, companyId).eq(CompanyCollection::getUserId, userId)); - company.setIsCollection(l>0?1:0); + //联系人 CompanyContact contact=new CompanyContact(); contact.setCompanyId(company.getCompanyId());