Merge branch 'feature-2024-06-cloud' into 'master'

Feature 2024 06 cloud

See merge request !2022

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/RightController.java

@@ -47,7 +47,7 @@ public class RightController extends WebBaseController {
         if(StringUtils.isEmpty(clerkId)) {
             return resultResponse(HaoBanErrCode.ERR_OTHER, "clerkId为空");
         }
-        ServiceResponse<List<RightMenuDTO>> resp = this.rightService.getHaobanMenu(enterpriseId, clerkId);
+        ServiceResponse<List<RightMenuDTO>> resp = this.rightService.getHaobanMenu(enterpriseId, clerkId, login.getWxEnterpriseId());
         if (resp.isSuccess()) {
             return resultResponse(HaoBanErrCode.ERR_1, resp.getResult());
         }
@@ -67,7 +67,7 @@ public class RightController extends WebBaseController {
         if(StringUtils.isEmpty(clerkId)) {
             return resultResponse(HaoBanErrCode.ERR_OTHER, "clerkId为空");
         }
-        ServiceResponse<Map<String,Object>> resp = this.rightService.listHaobanAllMenu(enterpriseId, clerkId);
+        ServiceResponse<Map<String,Object>> resp = this.rightService.listHaobanAllMenu(enterpriseId, clerkId, login.getWxEnterpriseId());
         if (resp.isSuccess()) {
             return resultResponse(HaoBanErrCode.ERR_1, resp.getResult());
         }

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/eventtracking/TrendVO.java

@@ -43,6 +43,11 @@ public class TrendVO implements Serializable {
     private Integer visitCnt;
 
     /**
+     * 人均访问次数
+     */
+    private Integer avgVisitCnt;
+
+    /**
      * 业务日期
      */
     private String bizDate;

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/eventtracking/WechatEventTrackingOverviewVO.java

@@ -38,6 +38,16 @@ public class WechatEventTrackingOverviewVO implements Serializable {
     private Double visitCntSply;
 
     /**
+     * 人均访问次数
+     */
+    private Integer avgVisitCnt;
+
+    /**
+     * 人均访问次数前一期
+     */
+    private Double avgVisitCntSply;
+
+    /**
      * 活跃率
      */
     private Double visitRate;