From 7bfa6a85ad6a6c537b0f7ddb9f6a8795c8e8c866 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期四, 09 六月 2022 16:44:24 +0800
Subject: [PATCH] 五社&社区企业&人大代表
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/controller/BaseController.java | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 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..652fb6d 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,9 +65,6 @@
public Long getCommunityId() {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
Long communityId = loginUserInfo.getCommunityId();
- if (null == communityId || 0 == communityId) {
- throw new ServiceException("用户未绑定社区");
- }
return communityId;
}
@@ -76,9 +76,6 @@
public String getCommunityName() {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
Long communityId = loginUserInfo.getCommunityId();
- if (null == communityId || 0 == communityId) {
- throw new ServiceException("用户未绑定社区");
- }
String communityName = loginUserInfo.getCommunityName();
return communityName;
}
@@ -113,14 +110,12 @@
else {
return "510423";
}
- }
- else {
- LoginUserInfoVO loginUserInfoVO=this.getLoginUserInfo();
- ComActVO comActVO=loginUserInfoVO.getComActVO();
- if(comActVO!=null){
- return comActVO.getAreaCode();
+ } else {
+ LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
+ if(isBlank(loginUserInfoVO.getAreaCode())){
+ return "510423";
}
- return "510423";
+ return loginUserInfoVO.getAreaCode();
}
}
--
Gitblit v1.7.1