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 @@ and a.CORPINFO_ID = #{pd.CORPINFO_ID} + + and (a.USERNAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')) +