From c740ca8adee39cf8ab0df70594b938a93a6d8afc Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 23 五月 2022 10:09:21 +0800
Subject: [PATCH] 花城E+bug更新

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/controller/BaseController.java |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 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..e57355b 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
@@ -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