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 fe5419d..6311290 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
@@ -10,7 +10,10 @@ import com.ruoyi.cms.domain.*;
 import com.ruoyi.cms.domain.query.LabelQuery;
 import com.ruoyi.cms.mapper.*;
 import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.core.domain.model.LoginSiteUser;
+import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.SiteSecurityUtils;
 import com.ruoyi.common.utils.bean.BeanUtils;
 import org.apache.poi.ss.usermodel.Cell;
@@ -54,11 +57,23 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper,Company> imple
     public Company selectCompanyByCompanyId(Long companyId)
     {
         Company company = companyMapper.selectById(companyId);
-        if(SiteSecurityUtils.isLogin()){
-            Long l = companyCollectionMapper.selectCount(Wrappers.<CompanyCollection>lambdaQuery().eq(CompanyCollection::getCompanyId, companyId).eq(CompanyCollection::getUserId, SiteSecurityUtils.getUserId()));
-            company.setIsCollection(l>0?1:0);
-        }else {
-            company.setIsCollection(0);
+        Long userId=null;
+        try {
+            LoginUser loginUser = SecurityUtils.getLoginUser();
+            userId = loginUser.getUserId();
+        }catch (Exception ignored){
+            LoginSiteUser siteUser = SiteSecurityUtils.getLoginSiteUser();
+            userId = siteUser.getUserId();
+        }
+        //收藏
+        Long l = companyCollectionMapper.selectCount(Wrappers.<CompanyCollection>lambdaQuery().eq(CompanyCollection::getCompanyId, companyId).eq(CompanyCollection::getUserId, userId));
+        company.setIsCollection(l>0?1:0);
+        //联系人
+        CompanyContact contact=new CompanyContact();
+        contact.setCompanyId(company.getCompanyId());
+        List<CompanyContact> contacts=companyContactMapper.getSelectList(contact);
+        if(contacts!=null){
+            company.setCompanyContactList(contacts);
         }
         return company;
     }