From d6aabd981bf80cd57c09819f42b1c4e79f1904f9 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期三, 21 九月 2022 10:13:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/sanshuohuitang_dev' into sanshuohuitang_dev
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/controller/BaseController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/controller/BaseController.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/controller/BaseController.java
index e57355b..c0a9cc3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/controller/BaseController.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/controller/BaseController.java
@@ -65,7 +65,7 @@
public Long getCommunityId() {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
Long communityId = loginUserInfo.getCommunityId();
- if (null == communityId || 0 == communityId) {
+ if (null == communityId) {
throw new ServiceException("用户未绑定社区");
}
return communityId;
@@ -139,8 +139,11 @@
}
public String getAppId(){
- LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
- return loginUserInfo.getAppId();
+ String appid = this.getRequest().getHeader("appid");
+ if(StringUtils.isEmpty(appid)){
+ return "wx0cef797390444b75";
+ }
+ return appid;
}
public String getAppSecret(){
--
Gitblit v1.7.1