From 58f9a98b3ab97d2f64b128cf4c16452a7db3930b 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: Mon, 14 Aug 2023 10:50:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/work/emergencyDrill/emergencyDrillDrawer.vue    | 2 +-
 ruoyi-ui/src/views/work/emergencyDrill/index.vue              | 2 +-
 ruoyi-ui/src/views/work/workTrain/index.vue                   | 2 +-
 ruoyi-ui/src/views/work/workTrain/workTrainDrawer.vue         | 2 +-
 .../src/main/resources/templates/pshManage/myChanges.html     | 4 ++--
 .../src/main/resources/templates/sspManage/myChanges.html     | 4 ++--
 yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml  | 1 +
 7 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/ruoyi-ui/src/views/work/emergencyDrill/emergencyDrillDrawer.vue b/ruoyi-ui/src/views/work/emergencyDrill/emergencyDrillDrawer.vue
index 1b2e358b..4c4f5bde 100644
--- a/ruoyi-ui/src/views/work/emergencyDrill/emergencyDrillDrawer.vue
+++ b/ruoyi-ui/src/views/work/emergencyDrill/emergencyDrillDrawer.vue
@@ -85,7 +85,7 @@
             </el-select>
             </el-form-item>
             <el-form-item label="培训标题" prop="trainTitle">
-              <el-input type="number" v-model="form.trainTitle" placeholder="请输入培训标题" />
+              <el-input v-model="form.trainTitle" placeholder="请输入培训标题" />
             </el-form-item>
             <el-form-item label="参与人数" prop="trainParticipants">
             <el-input type="number" v-model="form.trainParticipants" placeholder="请输入参与人数" />
diff --git a/ruoyi-ui/src/views/work/emergencyDrill/index.vue b/ruoyi-ui/src/views/work/emergencyDrill/index.vue
index 0cd02a61..da43f6af 100644
--- a/ruoyi-ui/src/views/work/emergencyDrill/index.vue
+++ b/ruoyi-ui/src/views/work/emergencyDrill/index.vue
@@ -184,7 +184,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="培训标题">
-            <el-input placeholder="请输入培训标题" v-model="form.trainTitle" :disabled="true"></el-input>
+            <el-input placeholder="请输入培训标题" v-model="form.trainTitle"></el-input>
           </el-form-item>
         <el-form-item label="参与人数" prop="trainParticipants">
           <el-input type="number" v-model="form.trainParticipants" placeholder="请输入工作参与者" />
diff --git a/ruoyi-ui/src/views/work/workTrain/index.vue b/ruoyi-ui/src/views/work/workTrain/index.vue
index f281478e..c2921b66 100644
--- a/ruoyi-ui/src/views/work/workTrain/index.vue
+++ b/ruoyi-ui/src/views/work/workTrain/index.vue
@@ -184,7 +184,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="培训标题">
-            <el-input placeholder="请输入培训标题" v-model="form.trainTitle" :disabled="true"></el-input>
+            <el-input placeholder="请输入培训标题" v-model="form.trainTitle"></el-input>
           </el-form-item>
         <el-form-item label="参与人数" prop="trainParticipants">
           <el-input type="number" v-model="form.trainParticipants" placeholder="请输入工作参与者" />
diff --git a/ruoyi-ui/src/views/work/workTrain/workTrainDrawer.vue b/ruoyi-ui/src/views/work/workTrain/workTrainDrawer.vue
index 9ce63f32..5b3d2895 100644
--- a/ruoyi-ui/src/views/work/workTrain/workTrainDrawer.vue
+++ b/ruoyi-ui/src/views/work/workTrain/workTrainDrawer.vue
@@ -85,7 +85,7 @@
             </el-select>
             </el-form-item>
             <el-form-item label="培训标题" prop="trainTitle">
-              <el-input type="number" v-model="form.trainTitle" placeholder="请输入培训标题" />
+              <el-input v-model="form.trainTitle" placeholder="请输入培训标题" />
             </el-form-item>
             <el-form-item label="参与人数" prop="trainParticipants">
               <el-input type="number" v-model="form.trainParticipants" placeholder="请输入参与人数" />
diff --git a/ruoyi-wechat/src/main/resources/templates/pshManage/myChanges.html b/ruoyi-wechat/src/main/resources/templates/pshManage/myChanges.html
index 422c5b39..624396a0 100644
--- a/ruoyi-wechat/src/main/resources/templates/pshManage/myChanges.html
+++ b/ruoyi-wechat/src/main/resources/templates/pshManage/myChanges.html
@@ -43,8 +43,8 @@
             </div>
             <div class="my-gallery row">
                 <figure th:if="${queryChangeNicked.fileListImgState == 'OK'}" th:each="fileListImgObj:${queryChangeNicked.fileListImg}">
-                    <a th:href="@{${fileListImgObj.fileUrl}}">
-                        <img th:src="${fileListImgObj.fileUrl}" class="img-border"/>
+                    <a th:if="${fileListImgObj!=null}" th:href="@{${fileListImgObj?.fileUrl}}">
+                        <img th:src="${fileListImgObj?.fileUrl}" class="img-border"/>
                     </a>
                 </figure>
             </div>
diff --git a/ruoyi-wechat/src/main/resources/templates/sspManage/myChanges.html b/ruoyi-wechat/src/main/resources/templates/sspManage/myChanges.html
index 23c6b5ce..1522606c 100644
--- a/ruoyi-wechat/src/main/resources/templates/sspManage/myChanges.html
+++ b/ruoyi-wechat/src/main/resources/templates/sspManage/myChanges.html
@@ -43,8 +43,8 @@
             </div>
             <div class="my-gallery row">
                 <figure th:if="${queryChangeNicked.fileListImgState == 'OK'}" th:each="fileListImgObj:${queryChangeNicked.fileListImg}">
-                    <a th:href="@{${fileListImgObj.fileUrl}}">
-                        <img th:src="${fileListImgObj.fileUrl}" class="img-border"/>
+                    <a th:if="${fileListImgObj!=null}" th:href="@{${fileListImgObj?.fileUrl}}">
+                        <img th:src="${fileListImgObj?.fileUrl}" class="img-border"/>
                     </a>
                 </figure>
             </div>
diff --git a/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml b/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml
index ea0346a4..c9b225b1 100644
--- a/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml
@@ -110,6 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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
+        left join sur_project sp on sp.id = wt.project_id
         <if test='trainType != null  and trainType == "0"'> left join sys_dict_data sdd on sdd.dict_type = 'train_nature_zxpx' and wt.train_nature = sdd.dict_value</if>
         <if test='trainType != null  and trainType == "1"'> left join sys_dict_data sdd on sdd.dict_type = 'train_nature_yjyl' and wt.train_nature = sdd.dict_value</if>
         <where>