From 6fa6cc83a1aa59ae4878075ff6e83fe6834bf53e Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 3 Aug 2021 09:46:56 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E8=B5=84=E6=BA=90=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/auth/service/impl/ExtAuthServiceImpl.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/dataease/auth/service/impl/ExtAuthServiceImpl.java b/backend/src/main/java/io/dataease/auth/service/impl/ExtAuthServiceImpl.java
index f38f9272a0..07eccc92c1 100644
--- a/backend/src/main/java/io/dataease/auth/service/impl/ExtAuthServiceImpl.java
+++ b/backend/src/main/java/io/dataease/auth/service/impl/ExtAuthServiceImpl.java
@@ -52,11 +52,11 @@ public class ExtAuthServiceImpl implements ExtAuthService {
         }
 
         if (!CollectionUtils.isEmpty(authMap.get("role"))) {
-            authURD.setUserIds(authMap.get("role").stream().map(item -> Long.parseLong(item.getAuthTarget())).collect(Collectors.toList()));
+            authURD.setRoleIds(authMap.get("role").stream().map(item -> Long.parseLong(item.getAuthTarget())).collect(Collectors.toList()));
         }
 
         if (!CollectionUtils.isEmpty(authMap.get("dept"))) {
-            authURD.setUserIds(authMap.get("dept").stream().map(item -> Long.parseLong(item.getAuthTarget())).collect(Collectors.toList()));
+            authURD.setDeptIds(authMap.get("dept").stream().map(item -> Long.parseLong(item.getAuthTarget())).collect(Collectors.toList()));
         }
         return authURD;
     }

From 70ee578133399d63415ee75e9f923ff69b2b43b0 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 3 Aug 2021 10:46:01 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20maven=E6=89=93=E5=8C=85=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=EF=BC=8C=E6=8C=87=E5=AE=9Amaven-resources-plugin?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/backend/pom.xml b/backend/pom.xml
index 229218d302..7539ed412b 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -414,6 +414,12 @@
                     <skipTests>true</skipTests>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.4.3</version>
+            </plugin>
+
             <plugin>
                 <artifactId>maven-clean-plugin</artifactId>
                 <configuration>

From 2b0ee551c9ae1f2658848b0dca33de7859770151 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Tue, 3 Aug 2021 10:57:52 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E9=9B=B7=E8=BE=BE=E5=9B=BEtooltip?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/chart/chart.js       |  6 +-----
 frontend/src/views/chart/chart/radar/radar.js | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/frontend/src/views/chart/chart/chart.js b/frontend/src/views/chart/chart/chart.js
index aec2f2a89d..e01892261c 100644
--- a/frontend/src/views/chart/chart/chart.js
+++ b/frontend/src/views/chart/chart/chart.js
@@ -508,11 +508,7 @@ export const BASE_RADAR = {
     },
     indicator: []
   },
-  series: [{
-    type: 'radar',
-    // areaStyle: {normal: {}},
-    data: []
-  }]
+  series: []
 }
 
 export const BASE_GAUGE = {
diff --git a/frontend/src/views/chart/chart/radar/radar.js b/frontend/src/views/chart/chart/radar/radar.js
index 113984ee5e..07e3f81a83 100644
--- a/frontend/src/views/chart/chart/radar/radar.js
+++ b/frontend/src/views/chart/chart/radar/radar.js
@@ -36,8 +36,19 @@ export function baseRadarOption(chart_option, chart) {
         y.label = customAttr.label
       }
       chart_option.legend.data.push(y.name)
+
+      const d = {
+        name: y.name,
+        type: 'radar',
+        data: [
+          {
+            value: y.data,
+            name: y.name
+          }
+        ]
+      }
       y.value = JSON.parse(JSON.stringify(y.data))
-      chart_option.series[0].data.push(y)
+      chart_option.series.push(d)
 
       maxValues.push(Math.max.apply(null, y.value))
     }