From 29167f6c5d895749f369fadbcd4b3c0a3a17052c Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期三, 14 九月 2022 15:40:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/sanshuohuitang_dev' into sanshuohuitang_dev

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java
index c067166..0b7f25b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java
@@ -395,7 +395,9 @@
         LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
         if (loginUserInfo != null) {
             userId = loginUserInfo.getUserId();
-            communityId = loginUserInfo.getCommunityId();
+            if(loginUserInfo.getCommunityId()!=null){
+                communityId = loginUserInfo.getCommunityId();
+            }
         }
         return communityService.getUserReward(userId, communityId);
     }

--
Gitblit v1.7.1