diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/CompanyMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/CompanyMapper.xml
index d66b3c1..e4786f3 100644
--- a/ruoyi-bussiness/src/main/resources/mapper/app/CompanyMapper.xml
+++ b/ruoyi-bussiness/src/main/resources/mapper/app/CompanyMapper.xml
@@ -44,16 +44,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ select="selectCompanyContactsById"
+ column="company_id"/>
-
-
-
-
+
+
+
+
+
+
select company_id, name, location, industry, scale, del_flag, create_by, create_time, update_by, update_time, remark,code,description,nature,company_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,
(select count(1)
@@ -155,10 +163,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and fc.del_flag = '0'
and fc.review_status = '1'
and f.end_time < CURRENT_TIMESTAMP
- and coalesce(a.attendance_status, '0') <> '1') as missed_outdoor_fair_count,
- cct.contact_person as con_contact_person,cct.contact_person_phone as con_contact_person_phone,
- cct.company_id as con_company_id,cct.id as con_company_contact_id from company cp
- left join company_contact cct on cp.company_id=cct.company_id and cct.del_flag='0'
+ and coalesce(a.attendance_status, '0') <> '1') as missed_outdoor_fair_count
+ from company cp
cp.del_flag = '0'
and cp.name like concat('%', cast(#{name, jdbcType=VARCHAR} as varchar), '%') and cp.location = #{location}
@@ -250,9 +256,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and fc.review_status = '1'
and f.end_time < CURRENT_TIMESTAMP
and coalesce(a.attendance_status, '0') <> '1') as missed_outdoor_fair_count,
- su.lc_userid,su.user_id,cct.contact_person as con_contact_person,cct.contact_person_phone as con_contact_person_phone,cct.company_id as con_company_id from company t
+ su.lc_userid,su.user_id from company t
left join sys_user su on t.code=su.id_card and su.del_flag='0'
- left join company_contact cct on t.company_id=cct.company_id and cct.del_flag='0'
t.del_flag = '0' and su.lc_userid is not null
and t.name like concat('%', cast(#{name, jdbcType=VARCHAR} as varchar), '%') and t.scale = #{scale}