From 5455d52bc749b2dc27c1a4165907e97ded71d45c Mon Sep 17 00:00:00 2001
From: chenshaohua <635616957@qq.com>
Date: Fri, 24 Jul 2026 12:39:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=81=E4=B8=9A=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E8=BF=94=E5=9B=9E=E4=BC=81=E4=B8=9A=E8=81=94=E7=B3=BB?=
 =?UTF-8?q?=E4=BA=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/app/CompanyMapper.xml    | 34 +++++++++++--------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/CompanyMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/CompanyMapper.xml
index 20f6089..7c18672 100644
--- a/ruoyi-bussiness/src/main/resources/mapper/app/CompanyMapper.xml
+++ b/ruoyi-bussiness/src/main/resources/mapper/app/CompanyMapper.xml
@@ -51,6 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="contactPerson" column="con_contact_person"/>
         <result property="contactPersonPhone" column="con_contact_person_phone"/>
         <result property="companyId" column="con_company_id" />
+        <result property="id" column="con_company_contact_id" />
     </resultMap>
 
     <sql id="selectCompanyVo">
@@ -141,24 +142,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <select id="selectCompanyList" parameterType="CompanySearch" resultMap="CompanyResult">
-        <include refid="selectCompanyVo"/>
-        <where>  del_flag = '0'
-            <if test="name != null  and name != ''"> and name like concat('%', cast(#{name, jdbcType=VARCHAR} as varchar), '%')</if>
-            <if test="location != null  and location != ''"> and location = #{location}</if>
+        select cp.company_id, cp.name, cp.location, cp.industry, cp.scale, cp.del_flag, cp.create_by, cp.create_time, cp.update_by, cp.update_time, cp.remark,
+               cp.code,cp.description,cp.nature,cp.company_nature,cp.total_recruitment,cp.registered_address,cp.contact_person,cp.contact_person_phone,cp.is_abnormal,
+               cp.not_pass_reason,cp.status,case when cp.status='2' then cp.update_time else null end reject_time,cp.is_imp_company,cp.imp_company_type,cp.enterprise_type,
+               cp.legal_person,cp.legal_id_card,cp.legal_phone,cp.is_hrs,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'
+        <where>  cp.del_flag = '0'
+            <if test="name != null  and name != ''"> and cp.name like concat('%', cast(#{name, jdbcType=VARCHAR} as varchar), '%')</if>
+            <if test="location != null  and location != ''"> and cp.location = #{location}</if>
             <include refid="companyIndustryFilter"/>
-            <if test="scale != null  and scale != ''"> and scale = #{scale}</if>
-            <if test="nature != null  and nature != ''"> and nature = #{nature}</if>
-            <if test="companyNature != null  and companyNature != ''"> and company_nature = #{companyNature}</if>
-            <if test="code != null  and code != ''"> and code = #{code}</if>
-            <if test="status != null  and status != ''"> and status = #{status}</if>
-            <if test="companyId != null  and companyId != ''"> and company_id = #{companyId}</if>
-            <if test="userId != null"> and user_id = #{userId}</if>
-            <if test="isHrs != null  and isHrs != ''"> and is_hrs = #{isHrs}</if>
+            <if test="scale != null  and scale != ''"> and cp.scale = #{scale}</if>
+            <if test="nature != null  and nature != ''"> and cp.nature = #{nature}</if>
+            <if test="companyNature != null  and companyNature != ''"> and cp.company_nature = #{companyNature}</if>
+            <if test="code != null  and code != ''"> and cp.code = #{code}</if>
+            <if test="status != null  and status != ''"> and cp.status = #{status}</if>
+            <if test="companyId != null  and companyId != ''"> and cp.company_id = #{companyId}</if>
+            <if test="userId != null"> and cp.user_id = #{userId}</if>
+            <if test="isHrs != null  and isHrs != ''"> and cp.is_hrs = #{isHrs}</if>
             <if test="startDate != null and startDate != ''">
-                and create_time >= #{startDate}
+                and cp.create_time >= #{startDate}
             </if>
             <if test="endDate != null and endDate != ''">
-                and create_time &lt;= #{endDate}
+                and cp.create_time &lt;= #{endDate}
             </if>
             <if test="missedOutdoorFairOnly == true">
                 and exists (