DZ/faw-report-library-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
mzaxd
2023-04-21 11:20:51 +08:00
parent 59c2d6f833
commit e92233eaca
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml
+4 -4
View File
@@ -115,19 +115,19 @@
<!-- </select>--> <!-- </select>-->
<select id="list" parameterType="com.adc.da.report.vo.ReportQueryVo" resultType="com.adc.da.report.vo.ReportVo"> <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 t.confidentialLevel, t.privacyLevel
FROM `tt_report_manage` AS t FROM `tt_report_manage` AS t
INNER JOIN ts_report_label AS trl ON t.id = trl.report_id INNER JOIN ts_report_label AS trl ON t.id = trl.report_id
WHERE 1 = 1 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}"%" and t.name like "%"#{Vo.name}"%"
</if> </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 and t.year in
<foreach collection="Vo.year" item="year" open="(" separator="," close=")"> <foreach collection="Vo.year" item="year" open="(" separator="," close=")">
#{year} #{year}
@@ -135,7 +135,7 @@
</if> </if>
<!--用户搜索--> <!--用户搜索-->
<if test="Vo.usid !=null and Vo.usid !=''"> <if test="Vo.usid != null and Vo.usid != ''">
and t.userId=#{Vo.usid} and t.userId=#{Vo.usid}
</if> </if>