From ead9940bf28def7cf16010498d5ef22dfbda002c Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 29 Sep 2022 15:08:57 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E4=BF=A1=E6=81=AF=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=BA=E6=98=BE=E7=A4=BA=E5=88=AB=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/java/io/dataease/dto/panel/PanelGroupDTO.java | 2 ++
 backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml  | 2 ++
 frontend/src/api/panel/panel.js                                | 1 +
 frontend/src/views/panel/list/common/PanelDetailInfo.vue       | 2 +-
 4 files changed, 6 insertions(+), 1 deletion(-)

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<PanelGroupDTO> {
     @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 @@
         <result column="default_panel_name" jdbcType="VARCHAR" property="defaultPanelName"/>
         <result column="source_panel_name" jdbcType="VARCHAR" property="sourcePanelName"/>
         <result column="creator_name" jdbcType="VARCHAR" property="creatorName"/>
+        <result column="update_name" jdbcType="VARCHAR" property="updateName"/>
         <result column="is_default" property="isDefault"/>
     </resultMap>
 
@@ -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 @@
     </el-col>
     <el-col class="info-item">
       <p class="info-title">{{ $t('panel.update_by') }}</p>
-      <p class="info-content">{{ panelInfo.updateBy || 'N/A' }}</p>
+      <p class="info-content">{{ panelInfo.updateName || 'N/A' }}</p>
     </el-col>
     <el-col class="info-item">
       <p class="info-title">{{ $t('panel.update_time') }}</p>