From 93679092dea9b8a399ee2ee144a430b3aa37e1ab Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Fri, 22 Dec 2023 17:07:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E7=9C=8Bbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mybatis/datasource/xgf/TrainingBatchMapper.xml | 5 ++++-
 src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml  | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/mybatis/datasource/xgf/TrainingBatchMapper.xml b/src/main/resources/mybatis/datasource/xgf/TrainingBatchMapper.xml
index 8b75a2cb..4f8b7672 100644
--- a/src/main/resources/mybatis/datasource/xgf/TrainingBatchMapper.xml
+++ b/src/main/resources/mybatis/datasource/xgf/TrainingBatchMapper.xml
@@ -363,12 +363,15 @@
 		select b.MANAGER_DEPARTMENT_NAME,
 			   b.MANAGER_USER_NAME,
 			   a.MANAGER_STATE,
+			   a.MANAGER_OPINION,
 			   b.SUPERVISION_DEPARTMENT_NAME,
 			   b.SUPERVISION_USER_NAME,
 			   a.SUPERVISION_STATE,
+			   a.SUPERVISION_OPINION,
 			   b.TERRITORIALITY_DEPARTMENT_NAME,
 			   b.TERRITORIALITY_USER_NAME,
-			   a.TERRITORIALITY_STATE
+			   a.TERRITORIALITY_STATE,
+			   a.TERRITORIALITY_OPINION
 		from xgf_train_users a
 				 left join xgf_training_batch b on a.TRAINING_BATCH_ID = b.TRAINING_BATCH_ID
 		where a.IS_DELETE = '0'
diff --git a/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml b/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml
index 99460b69..9196bc81 100644
--- a/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml
+++ b/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml
@@ -223,6 +223,9 @@
 		<if test="pd.CORPINFO_ID != '' and pd.CORPINFO_ID != null">
 			and a.CORPINFO_ID = #{pd.CORPINFO_ID}
 		</if>
+		<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''">
+			and (a.USERNAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%'))
+		</if>
 	</select>
 	<select id="getInfoById" resultType="com.zcloud.entity.PageData">
 		select a.XGF_USER_ID,