From df2ff592a5b9037a747032f3351836e0c61fb4f9 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 16 一月 2026 08:59:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/resources/mapper/staff/StaffOnJobMapper.xml | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/staff/StaffOnJobMapper.xml b/src/main/resources/mapper/staff/StaffOnJobMapper.xml
index 25e79b8..71eb981 100644
--- a/src/main/resources/mapper/staff/StaffOnJobMapper.xml
+++ b/src/main/resources/mapper/staff/StaffOnJobMapper.xml
@@ -1,12 +1,15 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.ruoyi.staff.mapper.StaffOnJobMapper">
- <select id="staffOnJobListPage" resultType="com.ruoyi.staff.pojo.StaffOnJob">
+ <select id="staffOnJobListPage" resultType="com.ruoyi.staff.dto.StaffOnJobDto">
SELECT
- *
+ staff_on_job.*,
+ sp.post_name as postName
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 staffOnJob.staffState != '' ">
+ <if test="staffOnJob.staffState != null">
AND staff_state = #{staffOnJob.staffState}
</if>
<if test="staffOnJob.staffName != null and staffOnJob.staffName != '' ">
--
Gitblit v1.9.3