From eab743412e42b6aceb60b311dd2c3ce5d4aa1145 Mon Sep 17 00:00:00 2001
From: chenshaohua <635616957@qq.com>
Date: Wed, 22 Jul 2026 11:36:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E2=80=94=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=AB=AF=E4=BC=81=E4=B8=9A=E8=B4=A6=E6=88=B7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=EF=BC=9A=E6=B3=95=E5=AE=9A=E4=BB=A3=E8=A1=A8=E4=BA=BA=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=97=A0=E6=95=88=E3=80=81=E5=88=97=E8=A1=A8=E7=9A=84?=
 =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA=E3=80=81=E8=81=94=E7=B3=BB=E7=94=B5?=
 =?UTF-8?q?=E8=AF=9D=E3=80=81=E4=BC=81=E4=B8=9A=E8=A7=84=E6=A8=A1=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=9C=AA=E5=9C=A8=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=EF=BC=8C=E6=9F=A5=E8=AF=A2=E4=B9=9F=E6=97=A0=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/app/CompanyMapper.xml    | 30 +++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/CompanyMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/CompanyMapper.xml
index 0b70d9e..91c2f54 100644
--- a/ruoyi-bussiness/src/main/resources/mapper/app/CompanyMapper.xml
+++ b/ruoyi-bussiness/src/main/resources/mapper/app/CompanyMapper.xml
@@ -42,6 +42,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="isHrs"    column="is_hrs"    />
         <result property="lcUserid"    column="lc_userid"    />
 
+        <collection property="companyContactList" ofType="com.ruoyi.common.core.domain.entity.CompanyContact"
+                    resultMap="CompanyContactResult"/>
+    </resultMap>
+
+    <resultMap type="com.ruoyi.common.core.domain.entity.CompanyContact" id="CompanyContactResult">
+        <result property="contactPerson" column="con_contact_person"/>
+        <result property="contactPersonPhone" column="con_contact_person_phone"/>
+        <result property="companyId" column="con_company_id" />
     </resultMap>
 
     <sql id="selectCompanyVo">
@@ -182,8 +190,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select t.company_id, t.name, t.location, t.industry, t.scale, t.del_flag, t.create_by, t.create_time, t.update_by, t.update_time, t.remark,t.code,t.description,
                t.nature,t.company_nature,t.total_recruitment,t.registered_address,t.contact_person,t.contact_person_phone,t.is_abnormal,t.not_pass_reason,t.status,case when t.status='2'
                then t.update_time else null end reject_time,t.is_imp_company,t.imp_company_type,t.enterprise_type,t.legal_person,t.legal_id_card,t.legal_phone,t.is_hrs,
-               su.lc_userid from company t
-        left join sys_user su on t.code=su.id_card
+               su.lc_userid,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
+        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'
         <where>  t.del_flag = '0' and su.lc_userid is not null
             <if test="name != null  and name != ''"> and t.name like concat('%', cast(#{name, jdbcType=VARCHAR} as varchar), '%')</if>
             <if test="scale != null  and scale != ''"> and t.scale = #{scale}</if>
@@ -193,6 +202,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="status != null  and status != ''"> and t.status = #{status}</if>
             <if test="companyId != null  and companyId != ''"> and t.company_id = #{companyId}</if>
             <if test="isHrs != null  and isHrs != ''"> and t.is_hrs = #{isHrs}</if>
+            <if test="legalPerson != null  and legalPerson != ''"> and t.legal_person like concat('%', cast(#{legalPerson, jdbcType=VARCHAR} as varchar), '%')</if>
+            <if test="contactPerson != null  and contactPerson != ''">
+                AND EXISTS (
+                SELECT 1 FROM company_contact cc
+                WHERE cc.company_id = t.company_id
+                AND cc.del_flag = '0'
+                AND cc.contact_person LIKE concat('%', cast(#{contactPerson, jdbcType=VARCHAR} as varchar), '%')
+                )
+            </if>
+            <if test="contactPersonPhone != null  and contactPersonPhone != ''">
+                AND EXISTS (
+                SELECT 1 FROM company_contact cc
+                WHERE cc.company_id = t.company_id
+                AND cc.del_flag = '0'
+                AND cc.contact_person_phone LIKE concat('%', cast(#{contactPersonPhone, jdbcType=VARCHAR} as varchar), '%')
+                )
+            </if>
             <if test="startDate != null and startDate != ''">
                 and t.create_time >= #{startDate}
             </if>