dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #12598 from dataease/pr@dev@fix_app-linkage

Browse Source 
fix(仪表板): 修复应用仪表板部分打开可能提示联动错误问题
This commit is contained in:
王嘉豪 2024-10-09 17:27:51 +08:00 committed by GitHub
commit 887349e2ce
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/backend/src/main/java/io/dataease/ext/ExtPanelViewLinkageMapper.xml
View File

@ -102,8 +102,11 @@
</insert> </insert>
<select id="getPanelAllLinkageInfo" resultMap="AllLinkageMap"> <select id="getPanelAllLinkageInfo" resultMap="AllLinkageMap">
SELECT SELECT DISTINCT
distinct panel_view_linkage.source_view_id,
panel_view_linkage_field.source_field,
panel_view_linkage.target_view_id,
panel_view_linkage_field.target_field,
CONCAT( panel_view_linkage.source_view_id, '#', panel_view_linkage_field.source_field ) AS 'sourceInfo', CONCAT( panel_view_linkage.source_view_id, '#', panel_view_linkage_field.source_field ) AS 'sourceInfo',
CONCAT( panel_view_linkage.target_view_id, '#', panel_view_linkage_field.target_field ) AS 'targetInfo' CONCAT( panel_view_linkage.target_view_id, '#', panel_view_linkage_field.target_field ) AS 'targetInfo'
FROM FROM
@ -111,8 +114,10 @@
LEFT JOIN panel_view_linkage_field ON panel_view_linkage.id = panel_view_linkage_field.linkage_id LEFT JOIN panel_view_linkage_field ON panel_view_linkage.id = panel_view_linkage_field.linkage_id
WHERE WHERE
panel_view_linkage.panel_id = #{panelId} panel_view_linkage.panel_id = #{panelId}
and panel_view_linkage.linkage_active=1 AND panel_view_linkage.linkage_active = 1
and panel_view_linkage_field.id is not null AND panel_view_linkage_field.id IS NOT NULL
AND panel_view_linkage.source_view_id IS NOT NULL
AND panel_view_linkage.target_view_id IS NOT NULL
</select> </select>
<insert id="copyViewLinkage"> <insert id="copyViewLinkage">