From 63cdfcdab5b90e25dc468967c5e4ac0315965f02 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 10 八月 2021 09:55:38 +0800
Subject: [PATCH] 小程序登录以及实名认证模块改版
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
index 547f2d3..88f8d53 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
@@ -45,8 +45,10 @@
@ApiOperation(value = "分页获取社区动态",response = ComActDynVO.class)
@PostMapping("pagedynamic")
public R pageDynamic(@RequestBody ComActDynVO comActDynVO){
- Long communityId = this.getCommunityId();
- comActDynVO.setCommunityId(communityId);
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if(loginUserInfo != null){
+ comActDynVO.setCommunityId(loginUserInfo.getCommunityId());
+ }
comActDynVO.setIsTopping(null);
comActDynVO.setStatus(1);
return communityService.pageDynamic(comActDynVO);
@@ -82,8 +84,10 @@
@ApiOperation(value = "分页查询社区活动",response = ComActActivityVO.class)
@PostMapping("pageactivity")
public R pageActivity(@RequestBody ComActActivityVO comActActivityVO){
- Long communityId = this.getCommunityId();
- comActActivityVO.setCommunityId(communityId);
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if(loginUserInfo != null){
+ comActActivityVO.setCommunityId(loginUserInfo.getCommunityId());
+ }
comActActivityVO.setIsApplets(1);
Integer status = comActActivityVO.getStatus();
if (null!=status&&status.intValue()==4) {
@@ -172,9 +176,14 @@
@ApiOperation(value = "分页查询志愿者团队",response = ComMngVolunteerMngVO.class)
@PostMapping("pagevolunteer")
public R pageVolunteer(@RequestBody @Validated(PageGroup.class) PageVolunteerDTO pageVolunteerDTO){
- Long communityId = this.getCommunityId();
ComMngVolunteerMngVO comMngVolunteerMngVO=new ComMngVolunteerMngVO();
- comMngVolunteerMngVO.setCommunityId(communityId);
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if(loginUserInfo != null){
+ comMngVolunteerMngVO.setCommunityId(loginUserInfo.getCommunityId());
+ }
+// Long communityId = this.getCommunityId();
+
+// comMngVolunteerMngVO.setCommunityId(communityId);
comMngVolunteerMngVO.setPageNum(pageVolunteerDTO.getPageNum());
comMngVolunteerMngVO.setPageSize(pageVolunteerDTO.getPageSize());
return communityService.pageVolunteer(comMngVolunteerMngVO);
--
Gitblit v1.7.1