修复报表列表接口重复列Bug

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>