Merge branch 'dev' of github.com:dataease/dataease into dev

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>

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;
     }

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 = {

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))
     }