From 3403a1c0e85fa19ef235b11e368f724f7388cc04 Mon Sep 17 00:00:00 2001
From: chenxinying <1039655633@qq.com>
Date: Fri, 26 Jan 2024 11:02:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E7=81=AB=E4=BD=9C=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/datasource/eightwork/EightWorkTaskMapper.xml  | 4 ++--
 .../mybatis/datasource/eightwork/HotWorkMapper.xml        | 8 +++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/mybatis/datasource/eightwork/EightWorkTaskMapper.xml b/src/main/resources/mybatis/datasource/eightwork/EightWorkTaskMapper.xml
index 3f3ce9f..5d6d9a8 100644
--- a/src/main/resources/mybatis/datasource/eightwork/EightWorkTaskMapper.xml
+++ b/src/main/resources/mybatis/datasource/eightwork/EightWorkTaskMapper.xml
@@ -43,8 +43,8 @@
 
 	<select id="checkWorkCount" parameterType="pd" resultType="pd" >
 		select (select count(1) COUNT from bus_hotwork_sign sign
-		 left join bus_hotwork a on a.HOTWORK_ID = sign.HOTWORK_ID
-		 where sign.SIGN_TIME is null and sign.SIGN_USER_ID = #{USER_ID} and a.STEP_ID != '-1') HOTWORK_COUNT
+		 left join bus_hotwork work on work.HOTWORK_ID = sign.HOTWORK_ID
+		 where sign.SIGN_TIME is null and sign.SIGN_USER_ID = #{USER_ID} and work.STEP_ID != '-1') HOTWORK_COUNT
 	</select>
 
 </mapper>
diff --git a/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml b/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml
index 5f6f782..24c148a 100644
--- a/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml
+++ b/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml
@@ -476,9 +476,7 @@
                 and sign.SIGN_TIME is null
                 and sign.SIGN_USER_ID = #{pd.USER_ID}
                 and step.STEP_NAME = #{pd.STEP_NAME}
-                <if test="pd.measures != null and pd.measures != ''"><!-- 如果是多个安全措施确认人，某个人打回，则其他确认人不显示打回作业 -->
-                    and f.STEP_ID != -1
-                </if>
+                and f.STEP_ID != -1
             )
         </if>
         <if test="pd.STEP_ID != null and pd.STEP_ID != ''"><!-- 关键词检索 -->
@@ -514,10 +512,10 @@
         from
             bus_hotwork_sign sign
         left join bus_eightwork_step step on step.STEP_ID = sign.STEP_ID
-        left join bus_hotwork a on a.HOTWORK_ID = sign.HOTWORK_ID
+        left join bus_hotwork work on work.HOTWORK_ID = sign.HOTWORK_ID
         where
             sign.SIGN_TIME is null
-            and a.STEP_ID != '-1'
+            and work.STEP_ID != '-1'
         and
             sign.SIGN_USER_ID = #{USER_ID}
         group by step.CODE