Merge remote-tracking branch 'origin/dev-3.6' into dev-3.7rel-23.04.03

2 files changed, 4 insertions, 8 deletions

diff --git a/nz-admin/src/main/java/com/nis/modules/dashboard/service/impl/VisualChartServiceImpl.java b/nz-admin/src/main/java/com/nis/modules/dashboard/service/impl/VisualChartServiceImpl.java
index 2d4a7787..fec4aec5 100644
--- a/nz-admin/src/main/java/com/nis/modules/dashboard/service/impl/VisualChartServiceImpl.java
+++ b/nz-admin/src/main/java/com/nis/modules/dashboard/service/impl/VisualChartServiceImpl.java
@@ -674,8 +674,7 @@ public class VisualChartServiceImpl extends ServiceImpl<VisualChartDao, VisualCh
 		Integer syncDashboardLink = syncChartDashboard.getLink();
 
 		// copy Properties
-		VisualChart saveChart = new VisualChart();
-		BeanUtil.copyProperties(tmplChartForSync, saveChart);
+		VisualChart saveChart = JSONUtil.toBean(JSONUtil.toJsonStr(tmplChartForSync), VisualChart.class);
 
 		saveChart.setId(null);
 		saveChart.setDashboardId(syncDashboardId);
@@ -699,8 +698,7 @@ public class VisualChartServiceImpl extends ServiceImpl<VisualChartDao, VisualCh
 		if (Tool.CollUtil.isNotEmpty(saveChart.getElements())) {
 			List<VisualChartElement> saveElementList = Tool.ListUtil.list(true);
 			for (VisualChartElement element : saveChart.getElements()) {
-				VisualChartElement saveElement = new VisualChartElement();
-				BeanUtil.copyProperties(element, saveElement);
+				VisualChartElement saveElement = JSONUtil.toBean(JSONUtil.toJsonStr(element), VisualChartElement.class);
 
 				saveElement.setId(null);
 				saveElement.setExpression(Tool.NzExpressionUtil.renderExpression(element.getExpression(), linkObject));
diff --git a/nz-admin/src/main/java/com/nis/modules/dashboard/service/impl/VisualServiceImpl.java b/nz-admin/src/main/java/com/nis/modules/dashboard/service/impl/VisualServiceImpl.java
index a17cd235..2ff9a370 100644
--- a/nz-admin/src/main/java/com/nis/modules/dashboard/service/impl/VisualServiceImpl.java
+++ b/nz-admin/src/main/java/com/nis/modules/dashboard/service/impl/VisualServiceImpl.java
@@ -703,8 +703,7 @@ public class VisualServiceImpl implements VisualService {
             }
 
             // update dashboard param & tmplid
-            VisualDashboard updateDashboardObject = new VisualDashboard();
-            BeanUtil.copyProperties(syncDashboard, updateDashboardObject);
+            VisualDashboard updateDashboardObject = JSONUtil.toBean(JSONUtil.toJsonStr(syncDashboard), VisualDashboard.class);
 
             updateDashboardObject.setParam(Tool.NzExpressionUtil.renderExpression(templateDashboardParam.toString(), linkObject));
             updateDashboardObject.setTmplId(templateDashboardId);
@@ -718,8 +717,7 @@ public class VisualServiceImpl implements VisualService {
             List<VisualChartElement> saveChartElementList = Tool.ListUtil.list(true);
             Map<Integer, Integer> groupIdMapping = new HashMap<>();
             for (VisualChart tempChart : templateDashboardCharts) {
-                VisualChart saveChart = new VisualChart();
-                BeanUtil.copyProperties(tempChart, saveChart);
+                VisualChart saveChart = JSONUtil.toBean(JSONUtil.toJsonStr(tempChart), VisualChart.class);
 
                 saveChart.setId(null);
                 saveChart.setDashboardId(syncDashboardId);