From e099a6d97190306b858bbdbc2efc7008205b885b Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Mon, 1 Jul 2024 09:07:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E6=95=99=E8=82=B2bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/WorkerSafeEducationWorkerMapper.xml    | 11 +++--------
 .../service/impl/WorkerSafeEducationServiceImpl.java  |  1 +
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerSafeEducationWorkerMapper.xml b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerSafeEducationWorkerMapper.xml
index 595912f72..6b1956438 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerSafeEducationWorkerMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerSafeEducationWorkerMapper.xml
@@ -102,16 +102,11 @@
     <select id="selectEdusByWorkerId" resultType="com.alibaba.fastjson.JSONObject">
         SELECT w.*,
         a.worker_name,
-        a.sex,
-        a.field_acquisition_url,
-        a.id_card idcardnumber,
-        (case
-        when a.birthday != '' then year(from_days(datediff(NOW(), a.birthday)))
-        else '-' end) age
+        e.edu_course_name
         FROM worker_safe_education_worker w
-        inner join worker_safe_education wse on w.edu_id = wse.id
         LEFT JOIN worker_info a ON w.worker_id = a.id
-        WHERE w.id = #{workerId}
+        LEFT JOIN worker_safe_education e on e.id=w.edu_id
+        WHERE w.worker_id = #{workerId}
         and w.project_sn = #{projectSn}
     </select>
 </mapper>
diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerSafeEducationServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerSafeEducationServiceImpl.java
index 8ffe5bc1b..2e8a429a8 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerSafeEducationServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerSafeEducationServiceImpl.java
@@ -132,6 +132,7 @@ public class WorkerSafeEducationServiceImpl extends ServiceImpl<WorkerSafeEducat
         workerSafeEducationWorkerMapper.delete(queryWrapper);
         if (workerSafeEducation.getList() != null && workerSafeEducation.getList().size() > 0) {
             for (WorkerSafeEducationWorker worker : workerSafeEducation.getList()) {
+                worker.setId(null);
                 worker.setEduId(workerSafeEducation.getId());
                 worker.setStudyTime(workerSafeEducation.getEduTime());
                 worker.setProjectSn(workerSafeEducation.getProjectSn());