From 63fa24fcb445ab31b55e6f2364adf0c90c5ca68a Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 4 Jun 2021 16:23:17 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BB=AA=E8=A1=A8?=
 =?UTF-8?q?=E7=9B=98=E8=A7=86=E5=9B=BE=E6=9F=A5=E4=B8=8D=E5=87=BA=E6=9D=A5?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/ext/ExtPanelViewMapper.java         |  5 +++--
 .../dataease/base/mapper/ext/ExtPanelViewMapper.xml |  4 ++--
 .../controller/panel/server/ViewServer.java         | 13 +++++++++----
 .../java/io/dataease/dto/panel/PanelViewDto.java    |  3 ++-
 .../java/io/dataease/dto/panel/po/PanelViewPo.java  |  3 ++-
 .../io/dataease/service/panel/PanelViewService.java |  4 ++--
 .../views/system/authority/components/LazyTree.vue  |  1 +
 7 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelViewMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelViewMapper.java
index b24a3973a3..85d7f46f6e 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelViewMapper.java
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelViewMapper.java
@@ -1,12 +1,13 @@
 package io.dataease.base.mapper.ext;
 
+import io.dataease.dto.panel.PanelViewDto;
 import io.dataease.dto.panel.po.PanelViewPo;
 
 import java.util.List;
 
 public interface ExtPanelViewMapper {
 
-    List<PanelViewPo> groups(String userId);
+    List<PanelViewDto> groups(String userId);
 
-    List<PanelViewPo> views(String userId);
+    List<PanelViewDto> views(String userId);
 }
diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelViewMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelViewMapper.xml
index ff3d44bfa5..329278dc2c 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelViewMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelViewMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="io.dataease.base.mapper.ext.ExtPanelViewMapper">
 
-    <resultMap id="treeNodeMap" type="io.dataease.dto.panel.po.PanelViewPo">
+    <resultMap id="treeNodeMap" type="io.dataease.dto.panel.PanelViewDto">
         <id column="id" property="id" />
         <result column="name" property="name" />
         <result column="pid" property="pid" />
@@ -12,7 +12,7 @@
 
 
     <select id="groups"  resultMap="treeNodeMap">
-        select id, pid,  name, `type`
+        select id, ifnull(pid,0) as pid,  name, `type`
         from (select GET_V_AUTH_MODEL_ID_P_USE (#{userId}, 'chart') cids) t,chart_group
         <where>
             FIND_IN_SET(chart_group.id,cids)
diff --git a/backend/src/main/java/io/dataease/controller/panel/server/ViewServer.java b/backend/src/main/java/io/dataease/controller/panel/server/ViewServer.java
index 74ce250504..e2bdfbb171 100644
--- a/backend/src/main/java/io/dataease/controller/panel/server/ViewServer.java
+++ b/backend/src/main/java/io/dataease/controller/panel/server/ViewServer.java
@@ -3,6 +3,7 @@ package io.dataease.controller.panel.server;
 import io.dataease.base.domain.ChartView;
 import io.dataease.base.domain.ChartViewWithBLOBs;
 import io.dataease.commons.utils.AuthUtils;
+import io.dataease.commons.utils.TreeUtils;
 import io.dataease.controller.panel.api.ViewApi;
 import io.dataease.controller.sys.base.BaseGridRequest;
 import io.dataease.controller.sys.base.ConditionEntity;
@@ -10,6 +11,7 @@ import io.dataease.dto.panel.PanelViewDto;
 import io.dataease.dto.panel.po.PanelViewPo;
 import io.dataease.service.chart.ChartViewService;
 import io.dataease.service.panel.PanelViewService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -35,10 +37,13 @@ public class ViewServer implements ViewApi {
      */
     @Override
     public List<PanelViewDto> treeWithAuth() {
-        List<PanelViewPo> groups = panelViewService.groups();
-        List<PanelViewPo> views = panelViewService.views();
-        List<PanelViewDto> panelViewDtos = panelViewService.buildTree(groups, views);
-        return panelViewDtos;
+        List<PanelViewDto> groups = panelViewService.groups();
+        List<PanelViewDto> views = panelViewService.views();
+        if(CollectionUtils.isNotEmpty(groups)&&CollectionUtils.isNotEmpty(views)){
+            groups.addAll(views);
+        }
+//        List<PanelViewDto> panelViewDtos = panelViewService.buildTree(groups, views);
+        return TreeUtils.mergeTree(groups);
     }
 
     @Override
diff --git a/backend/src/main/java/io/dataease/dto/panel/PanelViewDto.java b/backend/src/main/java/io/dataease/dto/panel/PanelViewDto.java
index 240064c6ad..c5a1c13c1e 100644
--- a/backend/src/main/java/io/dataease/dto/panel/PanelViewDto.java
+++ b/backend/src/main/java/io/dataease/dto/panel/PanelViewDto.java
@@ -1,5 +1,6 @@
 package io.dataease.dto.panel;
 
+import io.dataease.commons.model.ITreeBase;
 import lombok.Data;
 
 import java.util.ArrayList;
@@ -7,7 +8,7 @@ import java.util.List;
 import java.util.Optional;
 
 @Data
-public class PanelViewDto {
+public class PanelViewDto implements ITreeBase<PanelViewDto> {
 
     private String id;
 
diff --git a/backend/src/main/java/io/dataease/dto/panel/po/PanelViewPo.java b/backend/src/main/java/io/dataease/dto/panel/po/PanelViewPo.java
index 661069b136..aa9b4fa013 100644
--- a/backend/src/main/java/io/dataease/dto/panel/po/PanelViewPo.java
+++ b/backend/src/main/java/io/dataease/dto/panel/po/PanelViewPo.java
@@ -1,9 +1,10 @@
 package io.dataease.dto.panel.po;
 
+import io.dataease.commons.model.ITreeBase;
 import lombok.Data;
 
 @Data
-public class PanelViewPo {
+public class PanelViewPo{
 
     private String id;
 
diff --git a/backend/src/main/java/io/dataease/service/panel/PanelViewService.java b/backend/src/main/java/io/dataease/service/panel/PanelViewService.java
index 84992e6a21..7520493270 100644
--- a/backend/src/main/java/io/dataease/service/panel/PanelViewService.java
+++ b/backend/src/main/java/io/dataease/service/panel/PanelViewService.java
@@ -26,11 +26,11 @@ public class PanelViewService {
 
     private final static String SCENE_TYPE = "scene";
 
-    public List<PanelViewPo> groups(){
+    public List<PanelViewDto> groups(){
         return extPanelViewMapper.groups(String.valueOf(AuthUtils.getUser().getUserId()));
     }
 
-    public List<PanelViewPo> views(){
+    public List<PanelViewDto> views(){
         return extPanelViewMapper.views(String.valueOf(AuthUtils.getUser().getUserId()));
     }
 
diff --git a/frontend/src/views/system/authority/components/LazyTree.vue b/frontend/src/views/system/authority/components/LazyTree.vue
index 8e9c29d441..8f8fd53c7b 100644
--- a/frontend/src/views/system/authority/components/LazyTree.vue
+++ b/frontend/src/views/system/authority/components/LazyTree.vue
@@ -280,6 +280,7 @@ export default {
   .tree-main{
     height:  calc(100vh - 210px);
     border: 1px solid #e6e6e6;
+    overflow-y: auto!important;
   }
   .tree-head{
     height: 30px;