From 0c13eb833bb1f2c27cb825169aac24e52db7c1f7 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期二, 01 三月 2022 14:46:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/partyBuilding_lyq' into partyBuilding_lyq

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
index c826d8e..85f1587 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
@@ -73,6 +73,7 @@
         }
         comActDynVO.setIsTopping(null);
         comActDynVO.setStatus(1);
+        comActDynVO.setAreaCode(this.getAreaCode());
         return communityService.pageDynamic(comActDynVO);
     }
 
@@ -111,6 +112,7 @@
             comActActivityVO.setCommunityId(loginUserInfo.getCommunityId());
         }
         comActActivityVO.setIsApplets(1);
+        comActActivityVO.setAreaCode(this.getAreaCode());
         Integer status = comActActivityVO.getStatus();
         if (null != status && status.intValue() == 4) {
             comActActivityVO.setIsIng(1);

--
Gitblit v1.7.1