From 9849a99706d2c3c540d29778a1b5ff24a29264a8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 07 十二月 2021 10:46:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
index 47d8e12..6caf6a7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
@@ -6,12 +6,14 @@
 import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 
+import com.panzhihua.common.constants.HttpStatus;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.data.redis.core.StringRedisTemplate;
@@ -96,6 +98,10 @@
             Object data = r.getData();
             if (!ObjectUtils.isEmpty(data)) {
                 LoginUserInfoVO loginUserInfoVO = (LoginUserInfoVO)data;
+                //是否保存unionid
+//                if (Objects.isNull(loginUserInfoVO.getUnionid()) || "无".equals(loginUserInfoVO.getUnionid())) {
+//                    return R.fail(HttpStatus.UNAUTHORIZED, "token过期");
+//                }
                 R r1 = communityService.detailHouse(userId);
                 if(StringUtils.isNotEmpty(loginUserInfoVO.getIdCard())){
                     //查询实名用户绑定的实有人口地址

--
Gitblit v1.7.1