From 722aaee5e0b0e9c38dc02704ecdbc9a6f19fefa0 Mon Sep 17 00:00:00 2001
From: zhaoyu <zhaoyu>
Date: Thu, 11 Jan 2024 15:49:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E7=81=AB=E6=90=9C=E7=B4=A2=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datasource/highriskwork/HotWorkApplicationMapper.xml   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationMapper.xml b/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationMapper.xml
index a87579fb..038b8435 100644
--- a/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationMapper.xml
+++ b/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationMapper.xml
@@ -275,6 +275,9 @@
 		<if test="pd.keyJobNumber != null and pd.keyJobNumber != ''">
 			and (f.JOB_NUMBER LIKE CONCAT(CONCAT('%', #{pd.keyJobNumber}),'%'))
 		</if>
+		<if test="pd.applicantName != null and pd.applicantName != ''">
+			and (u.NAME LIKE CONCAT(CONCAT('%', #{pd.applicantName}),'%'))
+		</if>
 		<if test="pd.keyState != null and pd.keyState != ''">
 <!--			<if test='pd.keyState == "1"'>-->
 <!--				and f.STATE = '11'-->
@@ -291,10 +294,10 @@
 			and	f.STATE = #{pd.keyState}
 		</if>
 		<if test="pd.keyApplyUserName != null and pd.keyApplyUserName != ''"><!-- 申请人 -->
-			and f.HOTWORKAPPLICATION_ID in (select FOREIGN_KEY from bus_hotworkapplicationuser houtUser LEFT JOIN sus_user u  on u.user_id = houtUser.USER_ID where u.USERNAME = CONCAT(CONCAT('%', #{pd.keyApplyUserName}),'%') and STATE = '11')
+			and f.HOTWORKAPPLICATION_ID in (select FOREIGN_KEY from bus_hotworkapplicationuser houtUser LEFT JOIN vi_user_all u  on u.user_id = houtUser.USER_ID where u.USERNAME = CONCAT(CONCAT('%', #{pd.keyApplyUserName}),'%') and STATE = '11')
 		</if>
 		<if test="pd.keyApproveUserName != null and pd.keyApproveUserName != ''"><!-- 申请人 -->
-			and f.HOTWORKAPPLICATION_ID in (select FOREIGN_KEY from bus_hotworkapplicationuser houtUser LEFT JOIN sus_user u  on u.user_id = houtUser.USER_ID where u.USERNAME = CONCAT(CONCAT('%', #{pd.keyApproveUserName}),'%') and STATE = '12')
+			and f.HOTWORKAPPLICATION_ID in (select FOREIGN_KEY from bus_hotworkapplicationuser houtUser LEFT JOIN vi_user_all u  on u.user_id = houtUser.USER_ID where u.USERNAME = CONCAT(CONCAT('%', #{pd.keyApproveUserName}),'%') and STATE = '12')
 		</if>
 		<if test="pd.STATE != null and pd.STATE != ''">
 			<choose>