From 6f66108a8ea1c1271d4401f3c46070cb3b2ca99e Mon Sep 17 00:00:00 2001
From: wkc <978997012@qq.com>
Date: Wed, 11 Feb 2026 14:48:26 +0800
Subject: [PATCH] =?UTF-8?q?feat(staff-enterprise-relation):=20=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=B7=BB=E5=8A=A0=E5=91=98=E5=B7=A5?=
 =?UTF-8?q?=E5=A7=93=E5=90=8DJOIN?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CcdiStaffEnterpriseRelationMapper.xml     | 35 +++++++++++--------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiStaffEnterpriseRelationMapper.xml b/ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiStaffEnterpriseRelationMapper.xml
index 645646c..6d8524b 100644
--- a/ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiStaffEnterpriseRelationMapper.xml
+++ b/ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiStaffEnterpriseRelationMapper.xml
@@ -8,6 +8,7 @@
     <resultMap type="com.ruoyi.ccdi.domain.vo.CcdiStaffEnterpriseRelationVO" id="CcdiStaffEnterpriseRelationVOResult">
         <id property="id" column="id"/>
         <result property="personId" column="person_id"/>
+        <result property="personName" column="person_name"/>
         <result property="relationPersonPost" column="relation_person_post"/>
         <result property="socialCreditCode" column="social_credit_code"/>
         <result property="enterpriseName" column="enterprise_name"/>
@@ -27,35 +28,41 @@
     <!-- 分页查询员工实体关系列表 -->
     <select id="selectRelationPage" resultMap="CcdiStaffEnterpriseRelationVOResult">
         SELECT
-            id, person_id, relation_person_post, social_credit_code, enterprise_name,
-            status, remark, data_source, is_employee, is_emp_family, is_customer, is_cust_family,
-            created_by, create_time, updated_by, update_time
-        FROM ccdi_staff_enterprise_relation
+            ser.id, ser.person_id, bs.name as person_name, ser.relation_person_post,
+            ser.social_credit_code, ser.enterprise_name, ser.status, ser.remark,
+            ser.data_source, ser.is_employee, ser.is_emp_family, ser.is_customer,
+            ser.is_cust_family, ser.created_by, ser.create_time, ser.updated_by,
+            ser.update_time
+        FROM ccdi_staff_enterprise_relation ser
+        LEFT JOIN ccdi_base_staff bs ON ser.person_id = bs.id_card
         <where>
             <if test="query.personId != null and query.personId != ''">
-                AND person_id LIKE CONCAT('%', #{query.personId}, '%')
+                AND ser.person_id LIKE CONCAT('%', #{query.personId}, '%')
             </if>
             <if test="query.socialCreditCode != null and query.socialCreditCode != ''">
-                AND social_credit_code LIKE CONCAT('%', #{query.socialCreditCode}, '%')
+                AND ser.social_credit_code LIKE CONCAT('%', #{query.socialCreditCode}, '%')
             </if>
             <if test="query.enterpriseName != null and query.enterpriseName != ''">
-                AND enterprise_name LIKE CONCAT('%', #{query.enterpriseName}, '%')
+                AND ser.enterprise_name LIKE CONCAT('%', #{query.enterpriseName}, '%')
             </if>
             <if test="query.status != null">
-                AND status = #{query.status}
+                AND ser.status = #{query.status}
             </if>
         </where>
-        ORDER BY create_time DESC
+        ORDER BY ser.create_time DESC
     </select>
 
     <!-- 查询员工实体关系详情 -->
     <select id="selectRelationById" resultMap="CcdiStaffEnterpriseRelationVOResult">
         SELECT
-            id, person_id, relation_person_post, social_credit_code, enterprise_name,
-            status, remark, data_source, is_employee, is_emp_family, is_customer, is_cust_family,
-            created_by, create_time, updated_by, update_time
-        FROM ccdi_staff_enterprise_relation
-        WHERE id = #{id}
+            ser.id, ser.person_id, bs.name as person_name, ser.relation_person_post,
+            ser.social_credit_code, ser.enterprise_name, ser.status, ser.remark,
+            ser.data_source, ser.is_employee, ser.is_emp_family, ser.is_customer,
+            ser.is_cust_family, ser.created_by, ser.create_time, ser.updated_by,
+            ser.update_time
+        FROM ccdi_staff_enterprise_relation ser
+        LEFT JOIN ccdi_base_staff bs ON ser.person_id = bs.id_card
+        WHERE ser.id = #{id}
     </select>
 
     <!-- 判断身份证号和统一社会信用代码的组合是否已存在 -->