From 5dc04f3291c00d66f8733a49896612ea1e3b31c5 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 16 九月 2021 13:19:14 +0800
Subject: [PATCH] Merge branch 'test' into 'zzj'
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java
index 6794e09..3df433d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java
@@ -83,8 +83,8 @@
addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.yes);
}
}else{
- communityService.addSysConfValue(key + communityId,communityId,"社区邻里圈自动审核参数","2");
- addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.yes);
+ communityService.addSysConfValue(key + communityId,communityId,"社区邻里圈自动审核参数","1");
+ addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.no);
}
}else{
addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.yes);
@@ -206,7 +206,9 @@
@ApiOperation(value = "查询社区邻里圈话题列表", response = ComActNeighborCircleTopicAppVO.class)
@GetMapping("topic/list")
- public R getNeighborTopicByApp(@RequestParam("communityId") Long communityId,@RequestParam(value = "isZero",defaultValue = "2",required = false) Integer isZero) {
+ public R getNeighborTopicByApp(@RequestParam("communityId") Long communityId
+ ,@RequestParam(value = "isZero",defaultValue = "2",required = false) Integer isZero
+ ,@RequestParam(value = "name",defaultValue = "",required = false) String name) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
if (loginUserInfo != null) {
communityId = loginUserInfo.getCommunityId();
@@ -214,7 +216,7 @@
if(isZero == null){
isZero = 2;
}
- return communityService.getNeighborTopicByApp(communityId,isZero);
+ return communityService.getNeighborTopicByApp(communityId,isZero,name);
}
@ApiOperation(value = "用户新增邻里圈话题")
--
Gitblit v1.7.1