diff --git a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml
index f4103a8..c455718 100644
--- a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml
+++ b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml
@@ -246,16 +246,20 @@
WHERE
eo.DEL_FLAG = 0
- and ru.userId = #{pageVO.usid}
+ and (ru.userId = #{pageVO.usid}
+ or eo.id in (
+ SELECT tt.report_id from power_apply tt WHERE tt.user_id = #{pageVO.usid})
+ )
- or eo.id in (
- SELECT tt.report_id from power_apply tt WHERE tt.user_id = #{pageVO.usid}
- )
+
and name like CONCAT(CONCAT('%',#{pageVO.name}),'%')
+
+ and keycontent like CONCAT(CONCAT('%',#{pageVO.keyContent}),'%')
+
and year in