查看bug修复

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'

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,