吴树波 3 semanas atrás
pai
commit
c2c3ac5d6a

+ 8 - 3
fs-service/src/main/java/com/fs/company/service/impl/CompanyServiceImpl.java

@@ -45,6 +45,8 @@ import org.springframework.stereotype.Service;
 import com.fs.company.service.ICompanyService;
 import org.springframework.transaction.annotation.Transactional;
 
+import static com.fs.company.service.impl.CompanyMiniappServiceImpl.GET_MINI_APP_STR;
+
 /**
  * 企业Service业务层处理
  *
@@ -105,9 +107,12 @@ public class CompanyServiceImpl implements ICompanyService
      * @return 企业
      */
     @Override
-    public Company selectCompanyById(Long companyId)
-    {
-        return companyMapper.selectCompanyById(companyId);
+    public Company selectCompanyById(Long companyId){
+        Company company = companyMapper.selectCompanyById(companyId);
+        List<CompanyMiniapp> miniApp = companyMiniappService.getMiniAppListByCompanyList(Collections.singletonList(company.getCompanyId()));
+        company.setMiniAppMaster(GET_MINI_APP_STR.apply(0, miniApp));
+        company.setMiniAppServer(GET_MINI_APP_STR.apply(1, miniApp));
+        return company;
     }
 
     /**