From 75b7a414ef821a07426790cb79c37811ae2f07ac Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 27 一月 2026 10:42:20 +0800
Subject: [PATCH] 浪潮对接单点登录:mis管理系统配置修改

---
 src/main/resources/mapper/staff/StaffOnJobMapper.xml |   97 +++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 75 insertions(+), 22 deletions(-)

diff --git a/src/main/resources/mapper/staff/StaffOnJobMapper.xml b/src/main/resources/mapper/staff/StaffOnJobMapper.xml
index 6e0a956..c0ddadb 100644
--- a/src/main/resources/mapper/staff/StaffOnJobMapper.xml
+++ b/src/main/resources/mapper/staff/StaffOnJobMapper.xml
@@ -3,34 +3,87 @@
 <mapper namespace="com.ruoyi.staff.mapper.StaffOnJobMapper">
     <select id="staffOnJobListPage" resultType="com.ruoyi.staff.dto.StaffOnJobDto">
         SELECT
-        staff_on_job.*,
-        sp.post_name as postName
+            id,
+            staff_state,
+            staff_no,
+            staff_name,
+            sex,
+            native_place,
+            adress,
+            first_study,
+            profession,
+            identity_card,
+            age,
+            phone,
+            emergency_contact,
+            emergency_contact_phone,
+            contract_term,
+            contract_expire_time,
+            trial_end_date,
+            trial_start_date,
+            salary_select,
+            pro_salary,
+            date_select,
+            remark,
+            sign_date,
+            create_time,
+            create_user,
+            update_time,
+            update_user,
+            tenant_id,
+            sys_post_id,
+            sys_dept_id
         FROM staff_on_job
-        LEFT JOIN
-        sys_post sp ON sp.post_id = staff_on_job.sys_post_id
-        where 1=1
-        <if test="staffOnJob.staffState != null">
-        AND staff_state = #{staffOnJob.staffState}
-        </if>
-        <if test="staffOnJob.staffName != null and staffOnJob.staffName != '' ">
-            AND staff_name LIKE CONCAT('%',#{staffOnJob.staffName},'%')
-        </if>
-        <if test="staffOnJob.entryDateStart != null and staffOnJob.entryDateStart != '' ">
-            AND contract_expire_time &gt;= DATE_FORMAT(#{staffOnJob.entryDateStart},'%Y-%m-%d')
-        </if>
-        <if test="staffOnJob.entryDateEnd != null and staffOnJob.entryDateEnd != '' ">
-            AND  contract_expire_time &lt;= DATE_FORMAT(#{staffOnJob.entryDateEnd},'%Y-%m-%d')
-        </if>
+        <where>
+            <if test="staffOnJob.staffState != null and staffOnJob.staffState != '' ">
+                AND staff_state = #{staffOnJob.staffState}
+            </if>
+            <if test="staffOnJob.staffName != null and staffOnJob.staffName != '' ">
+                AND staff_name LIKE CONCAT('%',#{staffOnJob.staffName},'%')
+            </if>
+            <if test="staffOnJob.entryDateStart != null and staffOnJob.entryDateStart != '' ">
+                AND contract_expire_time &gt;= DATE_FORMAT(#{staffOnJob.entryDateStart},'%Y-%m-%d')
+            </if>
+            <if test="staffOnJob.entryDateEnd != null and staffOnJob.entryDateEnd != '' ">
+                AND contract_expire_time &lt;= DATE_FORMAT(#{staffOnJob.entryDateEnd},'%Y-%m-%d')
+            </if>
+        </where>
     </select>
     <select id="staffOnJobList" resultType="com.ruoyi.staff.dto.StaffOnJobDto">
         SELECT
-        staff_on_job.*,
-        sp.post_name as postName
+        id,
+        staff_state,
+        staff_no,
+        staff_name,
+        sex,
+        native_place,
+        adress,
+        first_study,
+        profession,
+        identity_card,
+        age,
+        phone,
+        emergency_contact,
+        emergency_contact_phone,
+        contract_term,
+        contract_expire_time,
+        trial_end_date,
+        trial_start_date,
+        salary_select,
+        pro_salary,
+        date_select,
+        remark,
+        sign_date,
+        create_time,
+        create_user,
+        update_time,
+        update_user,
+        tenant_id,
+        sys_post_id,
+        sys_dept_id
         FROM staff_on_job
-        LEFT JOIN
-        sys_post sp ON sp.post_id = staff_on_job.sys_post_id
         where 1=1
-        <if test="staffOnJob.staffState != null">
+        <if test="staffOnJob.staffState != null and staffOnJob.staffState != '' ">
             AND staff_state = #{staffOnJob.staffState}
         </if>
         <if test="staffOnJob.staffName != null and staffOnJob.staffName != '' ">

--
Gitblit v1.9.3