From 047dc0fe088f45d298822d4fc1bbe39c0a21fab7 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期二, 22 二月 2022 09:45:25 +0800
Subject: [PATCH] 修复bug
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 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 68ef37a..99ecce8 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())){
//查询实名用户绑定的实有人口地址
@@ -147,6 +153,7 @@
public R putUserAuthentication(@RequestBody @Validated(AddGroup.class) LoginUserInfoVO loginUserInfoVO) {
Long userId = this.getUserId();
loginUserInfoVO.setUserId(userId);
+ loginUserInfoVO.setCommunityId(this.getCommunityId());
R r = userService.putUserAuthentication(loginUserInfoVO);
if (R.isOk(r)) {
// 通过发通知
@@ -264,17 +271,17 @@
@ApiOperation(value = "我的活动", response = ComActActivityVO.class)
@ApiImplicitParam(name = "status", value = "活动状态（4 进行中 5 已结束 6 已取消）", required = false)
@GetMapping("listactivity")
- public R listActivity(@RequestParam("status") Integer status) {
+ public R listActivity(@RequestParam(value = "status", required = false) Integer status) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
Long userId = loginUserInfo.getUserId();
Long communityId = loginUserInfo.getCommunityId();
List<ComActActivityVO> comActActivityVOS = new ArrayList<>();
- R r = communityService.listActivity(userId);
- if (R.isOk(r)) {
+ R r = communityService.listActivity(userId, status);
+ if (R.isOk(r)&&r.getData()!=null) {
comActActivityVOS = (List<ComActActivityVO>)r.getData();
}
R r1 = partyBuildingService.listActivity(userId, communityId, status);
- if (R.isOk(r1)) {
+ if (R.isOk(r1)&&r1.getData()!=null) {
List<ComActActivityVO> data = (List<ComActActivityVO>)r1.getData();
comActActivityVOS.addAll(data);
}
--
Gitblit v1.7.1