From 6ed1a2d06150df04828790ceef6b829e588bbcc8 Mon Sep 17 00:00:00 2001
From: bupengxiang <bupengxiang@syxysoft.com>
Date: Wed, 26 Apr 2023 10:51:30 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8sql=20=E5=A2=9E=E5=8A=A0=E5=85=B3=E9=94=AE?=
 =?UTF-8?q?=E8=AF=8D=E6=A8=A1=E7=B3=8A=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/mapper/mysql/ReportManageMapper.xml      | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

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
         <if test="pageVO.usid !='' and pageVO.usid != null">
-            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})
+            )
         </if>
         <if test="pageVO.usid !='' and pageVO.usid != null">
-            or eo.id  in (
-            SELECT tt.report_id from power_apply tt WHERE tt.user_id = #{pageVO.usid}
-            )
+
         </if>
         <if test="pageVO.name !='' and pageVO.name != null">
             and name like  CONCAT(CONCAT('%',#{pageVO.name}),'%')
         </if>
+        <if test="pageVO.keyContent !='' and pageVO.keyContent != null">
+            and keycontent like  CONCAT(CONCAT('%',#{pageVO.keyContent}),'%')
+        </if>
         <!--年份搜索-->
         <if test="pageVO.year != null and pageVO.year.size() > 0">
             and year in