diff --git a/backend/src/main/java/io/dataease/dto/panel/PanelGroupDTO.java b/backend/src/main/java/io/dataease/dto/panel/PanelGroupDTO.java index 9a19f1516e..00b570a236 100644 --- a/backend/src/main/java/io/dataease/dto/panel/PanelGroupDTO.java +++ b/backend/src/main/java/io/dataease/dto/panel/PanelGroupDTO.java @@ -17,6 +17,8 @@ import java.util.Map; public class PanelGroupDTO extends PanelGroupWithBLOBs implements ITreeBase { @ApiModelProperty("创建用户名") private String creatorName; + @ApiModelProperty("更新用户名") + private String updateName; @ApiModelProperty("标签") private String label; @ApiModelProperty("是否叶子节点") diff --git a/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml b/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml index 3709b06ff3..d9249ab5d9 100644 --- a/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml +++ b/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml @@ -10,6 +10,7 @@ + @@ -17,6 +18,7 @@ select panel_group.*, panel_group.name as label, (select nick_name from sys_user where username = panel_group.create_by) as creator_name, + (select nick_name from sys_user where username = panel_group.update_by) as update_name, get_auths(panel_group.id, 'panel', #{userId}) as `privileges` from panel_group where id = #{panelId} diff --git a/frontend/src/api/panel/panel.js b/frontend/src/api/panel/panel.js index a904ecbd47..e7da3e0ff7 100644 --- a/frontend/src/api/panel/panel.js +++ b/frontend/src/api/panel/panel.js @@ -170,6 +170,7 @@ export function initPanelData(panelId, useCache = false, callback) { createTime: response.data.createTime, creatorName: response.data.creatorName, updateBy: response.data.updateBy, + updateName: response.data.updateName, updateTime: response.data.updateTime }) // 刷新联动信息 diff --git a/frontend/src/views/panel/list/common/PanelDetailInfo.vue b/frontend/src/views/panel/list/common/PanelDetailInfo.vue index 23270aa9dd..437c62a750 100644 --- a/frontend/src/views/panel/list/common/PanelDetailInfo.vue +++ b/frontend/src/views/panel/list/common/PanelDetailInfo.vue @@ -10,7 +10,7 @@

{{ $t('panel.update_by') }}

-

{{ panelInfo.updateBy || 'N/A' }}

+

{{ panelInfo.updateName || 'N/A' }}

{{ $t('panel.update_time') }}