fix: 导出功能增加returnChildren参数2.0-kz

2 files changed, 4 insertions, 3 deletions

diff --git a/nz-admin/src/main/java/com/nis/modules/panel/service/impl/VisualChartServiceImpl.java b/nz-admin/src/main/java/com/nis/modules/panel/service/impl/VisualChartServiceImpl.java
index 430c3954..b7f237ed 100644
--- a/nz-admin/src/main/java/com/nis/modules/panel/service/impl/VisualChartServiceImpl.java
+++ b/nz-admin/src/main/java/com/nis/modules/panel/service/impl/VisualChartServiceImpl.java
@@ -98,11 +98,11 @@ public class VisualChartServiceImpl extends ServiceImpl<VisualChartDao, VisualCh
             chart.setElements(chartIdAndElement.get(chart.getId()));
         }
         
-        Integer returnChildren = (Integer) params.get("returnChildren");
+        String returnChildren = (String) params.get("returnChildren");
         if(ToolUtil.isEmpty(returnChildren)) {
-        	returnChildren = 1 ;
+        	returnChildren = "1" ;
         }
-        if(returnChildren != 0) {
+        if(StrUtil.equals(returnChildren, "1")) {
         	List<Integer> fatherIds = result.stream().filter(chart->chart.getGroupId()==0).map(VisualChart::getId).collect(Collectors.toList());
         	if(ToolUtil.isNotEmpty(fatherIds)) {
         		Map<String, Object> queryChildren =new HashMap<String,Object>();
diff --git a/nz-admin/src/main/java/com/nis/modules/panel/service/impl/VisualPanelServiceImpl.java b/nz-admin/src/main/java/com/nis/modules/panel/service/impl/VisualPanelServiceImpl.java
index fbf2b7bd..e3eed9e0 100644
--- a/nz-admin/src/main/java/com/nis/modules/panel/service/impl/VisualPanelServiceImpl.java
+++ b/nz-admin/src/main/java/com/nis/modules/panel/service/impl/VisualPanelServiceImpl.java
@@ -1301,6 +1301,7 @@ public class VisualPanelServiceImpl extends ServiceImpl<VisualPanelDao, VisualPa
     public List<VisualChart> queryChartsByPanelId(String panelId,String chartId,Map<String,Object> params) {
     	params.put("panelId", panelId);
     	params.put("ids", chartId);
+    	params.put("returnChildren","0");
         PageUtils queryPage = visualChartService.queryPage(params);
         List<VisualChart> result = (List<VisualChart>) queryPage.getList();
         return result;