From 7cd9c2faa381dea97ef7902e7aaf6da8cdc6c0c0 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期四, 27 八月 2026 18:51:05 +0800
Subject: [PATCH] fix: 修复部门查询报错

---
 src/main/resources/mapper/technology/TechnologyOperationMapper.xml |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/technology/TechnologyOperationMapper.xml b/src/main/resources/mapper/technology/TechnologyOperationMapper.xml
index f6adc74..6b63fa5 100644
--- a/src/main/resources/mapper/technology/TechnologyOperationMapper.xml
+++ b/src/main/resources/mapper/technology/TechnologyOperationMapper.xml
@@ -14,13 +14,20 @@
         <result column="is_quality" property="isQuality" />
         <result column="type" property="type" />
         <result column="device_ledger_id" property="deviceLedgerId" />
+        <result column="plan_person" property="planPerson" />
+        <result column="executor" property="executor" />
+        <result column="process_type" property="processType" />
         <result column="create_user" property="createUser" />
         <result column="dept_id" property="deptId" />
     </resultMap>
 
     <select id="listPage" resultType="com.ruoyi.technology.bean.vo.TechnologyOperationVo">
-        select *
+        select t.*,
+               sp.staff_name as planPersonName,
+               se.staff_name as executorName
         from technology_operation t
+            left join staff_on_job sp on t.plan_person = sp.id
+            left join staff_on_job se on t.executor = se.id
         <where>
             <if test="c.name != null and c.name != ''">
                 and t.name like concat('%', #{c.name}, '%')
@@ -32,6 +39,6 @@
                 and t.type = #{c.type}
             </if>
         </where>
-        order by t.id asc
+        order by t.id desc
     </select>
 </mapper>

--
Gitblit v1.9.3