From b3d49fc7da8274bfabc0eee6066ab0a24cdd76e2 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 01 十一月 2023 15:12:51 +0800
Subject: [PATCH] Changes

---
 mes-basic/src/main/resources/mapper/StaffMapper.xml |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/mes-basic/src/main/resources/mapper/StaffMapper.xml b/mes-basic/src/main/resources/mapper/StaffMapper.xml
index ef5e413..e7a7b0f 100644
--- a/mes-basic/src/main/resources/mapper/StaffMapper.xml
+++ b/mes-basic/src/main/resources/mapper/StaffMapper.xml
@@ -40,6 +40,11 @@
 		<result property="crewId" column="crew_id"/>
 		<result property="personNature" column="person_nature"/>
 		<result property="trialDeadline" column="trial_deadline"/>
+<!--		<result property="divisionName" column="division_name"/>-->
+		<result property="factoryId" column="factory_id"/>
+		<result property="factoryName" column="factory_name"/>
+		<result property="companyId" column="company_id"/>
+		<result property="companyName" column="company_name"/>
 	</resultMap>
 
 
@@ -48,7 +53,7 @@
         staff."id",staff.division_id,staff.staff_no,staff.staff_name,
 				staff.phone,staff.email,bp.post_name post,staff.create_time,staff.update_time,
 				staff.create_user,staff.update_user,staff.active,staff.personnel_factor,staff.post_id,
-        division.division_name division_name,staff.person_nature,staff.trial_deadline
+        division.division_name division_name,staff.person_nature,staff.trial_deadline,staff.company_name,staff.factory_name
         FROM
         basic_staff staff
 				left join basic_post bp on bp."id"=staff.post_id

--
Gitblit v1.9.3