From 2217d46a8d732092419e04002013cb72535dfee8 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 19 Sep 2022 18:47:15 +0800
Subject: [PATCH 1/2] =?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=E8=AF=A6=E6=83=85=E5=BC=B9=E6=A1=86?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=94=A8=E6=88=B7=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  | 3 ++-
 frontend/src/api/panel/panel.js                                | 1 +
 frontend/src/views/panel/list/common/PanelDetailInfo.vue       | 2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)

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 08923a0fc0..9a19f1516e 100644
--- a/backend/src/main/java/io/dataease/dto/panel/PanelGroupDTO.java
+++ b/backend/src/main/java/io/dataease/dto/panel/PanelGroupDTO.java
@@ -15,6 +15,8 @@ import java.util.Map;
  */
 @Data
 public class PanelGroupDTO extends PanelGroupWithBLOBs implements ITreeBase<PanelGroupDTO> {
+    @ApiModelProperty("创建用户名")
+    private String creatorName;
     @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 22e01ad9fc..642bf572b2 100644
--- a/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml
+++ b/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml
@@ -9,11 +9,12 @@
         <result column="default_panel_id" jdbcType="VARCHAR" property="defaultPanelId"/>
         <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="is_default" property="isDefault"/>
     </resultMap>
 
     <select id="findOneWithPrivileges" resultMap="BaseResultMapDTO">
-        select panel_group.*,panel_group.name as label , get_auths(panel_group.id,'panel',#{userId}) as `privileges` from panel_group where id =#{panelId}
+        select panel_group.*,panel_group.name as label ,(select nick_name from sys_user where username =panel_group.create_by) as creator_name, get_auths(panel_group.id,'panel',#{userId}) as `privileges` from panel_group where id =#{panelId}
     </select>
 
     <select id="panelGroupInit" resultMap="BaseResultMapDTO">
diff --git a/frontend/src/api/panel/panel.js b/frontend/src/api/panel/panel.js
index e2e9277325..a904ecbd47 100644
--- a/frontend/src/api/panel/panel.js
+++ b/frontend/src/api/panel/panel.js
@@ -168,6 +168,7 @@ export function initPanelData(panelId, useCache = false, callback) {
       status: response.data.status,
       createBy: response.data.createBy,
       createTime: response.data.createTime,
+      creatorName: response.data.creatorName,
       updateBy: response.data.updateBy,
       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 0ee81f3c1a..23270aa9dd 100644
--- a/frontend/src/views/panel/list/common/PanelDetailInfo.vue
+++ b/frontend/src/views/panel/list/common/PanelDetailInfo.vue
@@ -2,7 +2,7 @@
   <el-row>
     <el-col class="info-item">
       <p class="info-title">{{ $t('panel.create_by') }}</p>
-      <p class="info-content">{{ panelInfo.createBy }}</p>
+      <p class="info-content">{{ panelInfo.creatorName }}</p>
     </el-col>
     <el-col class="info-item">
       <p class="info-title">{{ $t('panel.create_time') }}</p>

From 53dbd841a6aa02652072c65814bee887a1ea894d Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 20 Sep 2022 11:13:08 +0800
Subject: [PATCH 2/2] =?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=E8=AF=A6=E6=83=85=E5=BC=B9=E6=A1=86?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=94=A8=E6=88=B7=E5=88=AB=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml b/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml
index 642bf572b2..3709b06ff3 100644
--- a/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml
+++ b/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml
@@ -14,7 +14,12 @@
     </resultMap>
 
     <select id="findOneWithPrivileges" resultMap="BaseResultMapDTO">
-        select panel_group.*,panel_group.name as label ,(select nick_name from sys_user where username =panel_group.create_by) as creator_name, get_auths(panel_group.id,'panel',#{userId}) as `privileges` from panel_group where id =#{panelId}
+        select panel_group.*,
+               panel_group.name as label,
+               (select nick_name from sys_user where username = panel_group.create_by) as creator_name,
+               get_auths(panel_group.id, 'panel', #{userId}) as `privileges`
+        from panel_group
+        where id = #{panelId}
     </select>
 
     <select id="panelGroupInit" resultMap="BaseResultMapDTO">