diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppCompanyController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppCompanyController.java
index 7294d95..1bc03b0 100644
--- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppCompanyController.java
+++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppCompanyController.java
@@ -1,6 +1,7 @@
package com.ruoyi.cms.controller.app;
+import com.ruoyi.cms.domain.query.CompanySearch;
import com.ruoyi.common.core.domain.entity.Company;
import com.ruoyi.cms.domain.CompanyCard;
import com.ruoyi.cms.domain.query.LabelQuery;
@@ -95,6 +96,16 @@ public class AppCompanyController extends BaseController
companyCardService.cardCollection(companyCardId);
return success();
}
+
+ @GetMapping("/hrsList")
+ @ApiOperation("查询人力资源机构列表")
+ public TableDataInfo hrsList(CompanySearch company)
+ {
+ company.setIsHrs("0");//查询人力资源机构
+ startPage();
+ return getDataTable(companyService.selectCompanyList(company));
+ }
+
@BussinessLog(title = "取消收藏企业卡片")
@DeleteMapping("/card/collection/{companyCardId}")
@ApiOperation("取消收藏公司卡片")
diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/CompanyMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/CompanyMapper.xml
index 28f4524..2cbfb5b 100644
--- a/ruoyi-bussiness/src/main/resources/mapper/app/CompanyMapper.xml
+++ b/ruoyi-bussiness/src/main/resources/mapper/app/CompanyMapper.xml
@@ -38,11 +38,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
- select company_id, name, location, industry, scale, del_flag, create_by, create_time, update_by, update_time, remark,code,description,nature,total_recruitment,registered_address,contact_person,contact_person_phone,is_abnormal,not_pass_reason,status,case when status='2' then update_time else null end reject_time,is_imp_company,imp_company_type,enterprise_type,legal_person,legal_id_card,legal_phone from company
+ select company_id, name, location, industry, scale, del_flag, create_by, create_time, update_by, update_time, remark,code,description,nature,total_recruitment,registered_address,contact_person,contact_person_phone,is_abnormal,not_pass_reason,status,case when status='2' then update_time else null end reject_time,is_imp_company,imp_company_type,enterprise_type,legal_person,legal_id_card,legal_phone,is_hrs from company
@@ -128,6 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and code = #{code}
and status = #{status}
and company_id = #{companyId}
+ and is_hrs = #{isHrs}
and create_time >= #{startDate}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/Company.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/Company.java
index d6d0998..1e4df1e 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/Company.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/Company.java
@@ -127,6 +127,9 @@ public class Company extends BaseEntity
@ApiModelProperty("是否下架(0上架,1下架)")
private String companyStatus;
+ @ApiModelProperty("是否人力资源机构(0是,否)")
+ private String isHrs;
+
/**
* 岗位列表
*/
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SsoService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SsoService.java
index 9d2bd8b..7d48ae5 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SsoService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SsoService.java
@@ -297,6 +297,7 @@ public class SsoService {
company.setRegisteredAddress(object.getString("entRegisteredAddress"));
company.setNature(object.getString("entType"));
company.setDescription(object.getString("entIntro"));
+// company.setIsHrs(object.getString("isServiceProvider").equals("Y")?"0":null);//是否是人力资源机构
// company.setScale(object.getString("entSize"));
companyService.insertCompany(company);
}