From e92233eaca144b03963e7949510a167971b7b2f1 Mon Sep 17 00:00:00 2001
From: Mzaxd <caihaohan0712@foxmail.com>
Date: Fri, 21 Apr 2023 11:20:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8A=A5=E8=A1=A8=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3=E9=87=8D=E5=A4=8D=E5=88=97Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mybatis/mapper/mysql/ReportManageMapper.xml | 8 ++++----
 1 file changed, 4 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 89feea2..75395b8 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
@@ -115,19 +115,19 @@
 <!--    </select>-->
 
     <select id="list" parameterType="com.adc.da.report.vo.ReportQueryVo" resultType="com.adc.da.report.vo.ReportVo">
-        SELECT t.id, t.year, t.name, t.keycontent, t.fileId, t.createDate, t.department, t.maincontent,
+        SELECT DISTINCT t.id, t.year, t.name, t.keycontent, t.fileId, t.createDate, t.department, t.maincontent,
                t.confidentialLevel, t.privacyLevel
         FROM `tt_report_manage` AS t
         INNER JOIN ts_report_label AS trl ON t.id = trl.report_id
         WHERE 1 = 1
 
         <!--报表名称搜索-->
-        <if test="Vo.name !=null and Vo.name !=''">
+        <if test="Vo.name != null and Vo.name != ''">
             and t.name like "%"#{Vo.name}"%"
         </if>
 
         <!--年份搜索-->
-        <if test="Vo.year !=null and Vo.year.size() >0">
+        <if test="Vo.year != null and Vo.year.size() > 0">
             and t.year in
             <foreach collection="Vo.year" item="year" open="(" separator="," close=")">
                 #{year}
@@ -135,7 +135,7 @@
         </if>
 
         <!--用户搜索-->
-        <if test="Vo.usid !=null and Vo.usid !=''">
+        <if test="Vo.usid != null and Vo.usid != ''">
             and t.userId=#{Vo.usid}
         </if>