From 217e39bec2ae2a861c4619d277ab0bc823cf85d4 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期五, 28 二月 2025 11:41:35 +0800
Subject: [PATCH] Merge branch 'dev_cr' into dev
---
cnas-personnel/src/main/resources/mapper/PersonTrainingRecordMapper.xml | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/cnas-personnel/src/main/resources/mapper/PersonTrainingRecordMapper.xml b/cnas-personnel/src/main/resources/mapper/PersonTrainingRecordMapper.xml
index c57dd3d..93360e5 100644
--- a/cnas-personnel/src/main/resources/mapper/PersonTrainingRecordMapper.xml
+++ b/cnas-personnel/src/main/resources/mapper/PersonTrainingRecordMapper.xml
@@ -3,10 +3,9 @@
<mapper namespace="com.ruoyi.personnel.mapper.PersonTrainingRecordMapper">
<select id="trainingAndAssessmentRecordsPage" resultType="com.ruoyi.personnel.dto.PersonTrainingRecordDto">
- select cptr.*, u.account, u.name user_name, u.phone, r.name role_name
+ select cptr.*, u.account, u.name user_name, u.phone
from cnas_person_training_record cptr
left join user u on u.id = cptr.user_id
- left join role r on r.id = u.role_id
where cptr.course_id = #{trainingDetailedId}
<if test="userName != null and userName != ''">
and u.name like concat('%', #{userName}, '%')
--
Gitblit v1.9.3