From d97c26f44fe7faa9ab2a2ec3b73d7b0f49140d27 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 29 九月 2021 13:15:03 +0800
Subject: [PATCH] bug修复
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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 b4fa65d..3d63ca2 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
@@ -4,6 +4,7 @@
import javax.annotation.Resource;
+import com.panzhihua.common.model.dtos.community.PageComMngVillageDTO;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -43,6 +44,11 @@
@PostMapping("pagearea")
public R pageArea(@RequestBody ComMngStructAreaVO comMngStructAreaVO) {
return communityService.pageArea(comMngStructAreaVO);
+ }
+ @ApiOperation(value = "新分页查询小区", response = ComMngVillageVO.class)
+ @PostMapping("pagevillage")
+ public R pageVillage(@RequestBody PageComMngVillageDTO pageComMngVillageDTO) {
+ return communityService.pageVillage(pageComMngVillageDTO);
}
@ApiOperation(value = "分页获取社区动态", response = ComActDynVO.class)
@@ -108,7 +114,7 @@
if (loginUserInfo != null) {
userId = loginUserInfo.getUserId();
}
- return communityService.detailActivity(id, userId);
+ return communityService.detailActivity(id, userId,null,null);
}
@ApiOperation(value = "分页查询活动评价记录", response = ComActActEvaluateVO.class)
@@ -144,7 +150,7 @@
signactivityVO.setUserId(userId);
R r = communityService.signActivity(signactivityVO);
if (R.isOk(r) && signactivityVO.getType().intValue() == 1) {
- R r2 = communityService.detailActivity(activityId, userId);
+ R r2 = communityService.detailActivity(activityId, userId,null,null);
ComActActivityVO comActActivityVO =
JSONObject.parseObject(JSONObject.toJSONString(r2.getData()), ComActActivityVO.class);
SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO();
--
Gitblit v1.7.1