From 23ee98a71d92faca72dac6cc7835a6097317235c Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 22 一月 2026 13:40:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/resources/mapper/lavorissue/LavorIssueMapper.xml | 4 ++--
src/main/resources/mapper/collaborativeApproval/StaffContactsPersonalMapper.xml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/collaborativeApproval/StaffContactsPersonalMapper.xml b/src/main/resources/mapper/collaborativeApproval/StaffContactsPersonalMapper.xml
index 36ce60d..5003a8d 100644
--- a/src/main/resources/mapper/collaborativeApproval/StaffContactsPersonalMapper.xml
+++ b/src/main/resources/mapper/collaborativeApproval/StaffContactsPersonalMapper.xml
@@ -17,7 +17,7 @@
sjlr.phone,
scp.create_time
FROM staff_contacts_personal scp
- LEFT JOIN (select * from staff_join_leave_record WHERE staff_state = 1) sjlr ON scp.contact_id=sjlr.id
+ LEFT JOIN (select * from staff_on_job WHERE staff_state = 1) sjlr ON scp.contact_id=sjlr.id
where 1=1
<if test="staffContactsPersonalDTO.staffName != null and staffContactsPersonalDTO.staffName != ''">
and sjlr.staff_name like concat('%',#{staffContactsPersonalDTO.staffName},'%')
diff --git a/src/main/resources/mapper/lavorissue/LavorIssueMapper.xml b/src/main/resources/mapper/lavorissue/LavorIssueMapper.xml
index 81cf11d..5d447e1 100644
--- a/src/main/resources/mapper/lavorissue/LavorIssueMapper.xml
+++ b/src/main/resources/mapper/lavorissue/LavorIssueMapper.xml
@@ -10,7 +10,7 @@
t3.dict_label as dictName,
t4.dict_label as dictTypeName
from labor_issue t1
- left join staff_join_leave_record t2 on t1.staff_id = t2.id
+ left join staff_on_job t2 on t1.staff_id = t2.id
left join sys_dict_data t3 on t1.dict_id = t3.dict_value
left join sys_dict_data t4 on t1.dict_type = t4.dict_value
<where>
@@ -45,7 +45,7 @@
t3.dict_label as dictName,
t4.dict_label as dictTypeName
from labor_issue t1
- left join staff_join_leave_record t2 on t1.staff_id = t2.id
+ left join staff_on_job t2 on t1.staff_id = t2.id
left join sys_dict_data t3 on t1.dict_id = t3.dict_value
left join sys_dict_data t4 on t1.dict_type = t4.dict_value
<where>
--
Gitblit v1.9.3