Merge branch 'wyp/0421-fix' of Server/long-article-recommend into master

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/vo/CategoryGroupDataExport.java

@@ -12,4 +12,5 @@ public class CategoryGroupDataExport {
     private Integer firstLevel = 0;
     private Double readRate;
     private Double openRate;
+    private Double openFansRate;
 }

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/DataDashboardService.java

@@ -3772,7 +3772,10 @@ public class DataDashboardService {
                 CategoryGroupDataExport export = item.getValue();
                 if (export.getFansCount() != null && export.getFansCount() != 0) {
                     export.setReadRate((double) export.getViewCount() / export.getFansCount());
-                    export.setOpenRate((double) export.getFirstLevel() / export.getFansCount());
+                    export.setOpenFansRate((double) export.getFirstLevel() / export.getFansCount());
+                }
+                if (export.getViewCount() != null && export.getViewCount() != 0) {
+                    export.setOpenRate(((double) export.getFirstLevel() / export.getViewCount()));
                 }
                 result.add(export);
             }