From d6578ec702eb4fcff690d71ea3237a885f46b85c Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 06 七月 2022 15:37:49 +0800
Subject: [PATCH] Merge branch 'huacheng' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/controller/BaseController.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 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 6af6021..b427cd5 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
@@ -19,6 +19,9 @@
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
+import static java.util.Objects.isNull;
+import static org.apache.commons.lang3.StringUtils.isBlank;
+
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
* @description: 基础controller
@@ -62,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;
@@ -113,14 +116,13 @@
else {
return "510423";
}
- }
- else {
+ } else {
LoginUserInfoVO loginUserInfoVO=this.getLoginUserInfo();
ComActVO comActVO=loginUserInfoVO.getComActVO();
- if(comActVO!=null){
- return comActVO.getAreaCode();
+ if(isNull(comActVO) || isBlank(comActVO.getAreaCode())){
+ return "510423";
}
- return "510423";
+ return comActVO.getAreaCode();
}
}
--
Gitblit v1.7.1