From ad4692ea799e439ff70c38806a01d89c121e6681 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Fri, 22 Mar 2024 01:09:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/work/emergencyDrill/emergencyDrillDrawer.vue | 7 ++++---
 .../src/main/resources/mapper/work/WorkTrainMapper.xml     | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ruoyi-ui/src/views/work/emergencyDrill/emergencyDrillDrawer.vue b/ruoyi-ui/src/views/work/emergencyDrill/emergencyDrillDrawer.vue
index 6bf4661b..01260aef 100644
--- a/ruoyi-ui/src/views/work/emergencyDrill/emergencyDrillDrawer.vue
+++ b/ruoyi-ui/src/views/work/emergencyDrill/emergencyDrillDrawer.vue
@@ -481,13 +481,14 @@ export default {
         this.deptOptions = response.data;
         this.open = true;
       });
+      let that = this;
       getWorkTrain(id).then((response) => {
-        this.form = response.data;
+        that.form = response.data;
         let depts = [];
-        this.form.workTrainDeptList.forEach((item) => {
+        that.form.workTrainDeptList.forEach((item) => {
           depts.push(item.deptId);
         });
-        this.form.workTrainDeptList = depts;
+        that.form.workTrainDeptList = depts;
         if (that.form.trainFile) {
           that.files = that.form.trainFile.split(",");
         }
diff --git a/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml b/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml
index d93b5939..fe5b82dd 100644
--- a/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml
@@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectWorkTrainList" parameterType="WorkTrain" resultMap="WorkTrainResult">
-        select wt.id, wt.project_id, wt.project_name, wt.main_image, wt.train_type, wt.train_title, wt.train_nature, wt.train_participants, wt.begin_date, wt.end_date, wt.train_content, wt.train_file, wt.is_del, wt.create_by, wt.create_time, wt.update_by, wt.update_time, wt.remark, wt.data_type, sdd.dict_label as data_type_name, group_concat(sd.dept_id) as trainDeptIds, group_concat(sd.dept_name) as trainDeptNames
+        select wt.id, wt.project_id, sp.projectName as project_name, wt.main_image, wt.train_type, wt.train_title, wt.train_nature, wt.train_participants, wt.begin_date, wt.end_date, wt.train_content, wt.train_file, wt.is_del, wt.create_by, wt.create_time, wt.update_by, wt.update_time, wt.remark, wt.data_type, sdd.dict_label as data_type_name, group_concat(sd.dept_id) as trainDeptIds, group_concat(sd.dept_name) as trainDeptNames
         from work_train wt
         left join work_train_dept wtd on wtd.train_id = wt.id
         left join sys_dept sd on sd.dept_id = wtd.dept_id
@@ -60,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="projectId != null"> and wt.project_id = #{projectId}</if>
             <if test="deptId != null"> and wtd2.dept_id = #{deptId}</if>
             <if test="dataType != null"> and wt.data_type = #{dataType}</if>
-            <if test="projectName != null  and projectName != ''"> and wt.project_name like concat('%', #{projectName}, '%')</if>
+            <if test="projectName != null  and projectName != ''"> and sp.projectName like concat('%', #{projectName}, '%')</if>
             <if test="trainType != null  and trainType != ''"> and train_type = #{trainType}</if>
             <if test="trainTitle != null  and trainTitle != ''"> and train_title like concat('%', #{trainTitle}, '%')</if>
             <if test="trainNature != null  and trainNature != ''"> and wt.train_nature = #{trainNature}</if>