1

web/src/main/java/com/jpsoft/employment/modules/base/controller/CompanyController.java

@@ -240,8 +240,8 @@ public class CompanyController {
 
         Page<Company> page = companyService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
         for(Company company : page.getResult()){
-            company.setScaleName(dataDictionaryService.findNameByCatalogNameAndValue("企业规模", company.getScale()));
-            company.setIndustryName(dataDictionaryService.findNameByCatalogNameAndValue("所属行业", company.getIndustry()));
+            company.setScaleName(dataDictionaryService.getName(company.getScale()));
+            company.setIndustryName(dataDictionaryService.getName(company.getIndustry()));
         }
 
         msgResult.setResult(true);